From ea3de8ab10582af4f9442bf2ef10e89a1c8c6a9c Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 10:38:22 +0100
Subject: [PATCH 1/8] feat(inbox): add "Any" option to Source and Priority
 filters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The inbox Source and Priority filter popovers had no explicit way to go
back to "no filter" — you had to manually unselect each choice. Add an
"Any" row at the top of each popover that is checked when nothing else is
selected and clears that filter when clicked. Unselecting the last option
already collapses to the same empty ("Any") state.

Generated-By: PostHog Code
Task-Id: 97aa95fe-d9a3-4651-aa9b-9f636fc84832
---
 .../inbox/components/InboxSearchFilterBar.tsx | 35 +++++++++++++++++++
 .../stores/inboxSignalsFilterStore.test.ts    | 28 +++++++++++++++
 .../inbox/stores/inboxSignalsFilterStore.ts   |  6 ++++
 3 files changed, 69 insertions(+)

diff --git a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
index 5fff5f42c2..8b728cc06c 100644
--- a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
+++ b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
@@ -40,8 +40,14 @@ export function InboxSearchFilterBar({
   const toggleSourceProduct = useInboxSignalsFilterStore(
     (s) => s.toggleSourceProduct,
   );
+  const clearSourceProductFilter = useInboxSignalsFilterStore(
+    (s) => s.clearSourceProductFilter,
+  );
   const priorityFilter = useInboxSignalsFilterStore((s) => s.priorityFilter);
   const togglePriority = useInboxSignalsFilterStore((s) => s.togglePriority);
+  const clearPriorityFilter = useInboxSignalsFilterStore(
+    (s) => s.clearPriorityFilter,
+  );
 
   const activeSort = INBOX_SORT_OPTIONS.find(
     (option) =>
@@ -73,6 +79,11 @@ export function InboxSearchFilterBar({
         active={sourceProductFilter.length > 0}
       >
         <Flex direction="column" gap="0">
+          <InboxFilterAnyItem
+            label="Any"
+            active={sourceProductFilter.length === 0}
+            onClick={clearSourceProductFilter}
+          />
           {INBOX_SOURCE_OPTIONS.map((option) => {
             const isActive = sourceProductFilter.includes(option.value);
             return (
@@ -132,6 +143,11 @@ export function InboxSearchFilterBar({
         active={priorityFilter.length > 0}
       >
         <Flex direction="column" gap="0">
+          <InboxFilterAnyItem
+            label="Any"
+            active={priorityFilter.length === 0}
+            onClick={clearPriorityFilter}
+          />
           {INBOX_PRIORITY_OPTIONS.map((option) => {
             const isActive = priorityFilter.includes(option.value);
             return (
@@ -160,6 +176,25 @@ export function InboxSearchFilterBar({
   );
 }
 
+function InboxFilterAnyItem({
+  label,
+  active,
+  onClick,
+}: {
+  label: string;
+  active: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <button type="button" className={FILTER_ITEM_CLASS} onClick={onClick}>
+      <span className="truncate">{label}</span>
+      {active ? (
+        <CheckIcon size={12} className="shrink-0 text-gray-12" />
+      ) : null}
+    </button>
+  );
+}
+
 function InboxFilterPopover({
   label,
   value,
diff --git a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
index 64d14bd553..044f913674 100644
--- a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
+++ b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
@@ -71,6 +71,34 @@ describe("inboxSignalsFilterStore", () => {
     ]);
   });
 
+  it("clearPriorityFilter resets priorities back to Any (empty)", () => {
+    useInboxSignalsFilterStore.getState().setPriorityFilter(["P0", "P1"]);
+
+    useInboxSignalsFilterStore.getState().clearPriorityFilter();
+
+    expect(useInboxSignalsFilterStore.getState().priorityFilter).toEqual([]);
+  });
+
+  it("clearSourceProductFilter resets sources back to Any (empty)", () => {
+    useInboxSignalsFilterStore.getState().toggleSourceProduct("github");
+    useInboxSignalsFilterStore.getState().toggleSourceProduct("linear");
+
+    useInboxSignalsFilterStore.getState().clearSourceProductFilter();
+
+    expect(useInboxSignalsFilterStore.getState().sourceProductFilter).toEqual(
+      [],
+    );
+  });
+
+  it("toggling off the last source is equivalent to Any (empty)", () => {
+    useInboxSignalsFilterStore.getState().toggleSourceProduct("github");
+    useInboxSignalsFilterStore.getState().toggleSourceProduct("github");
+
+    expect(useInboxSignalsFilterStore.getState().sourceProductFilter).toEqual(
+      [],
+    );
+  });
+
   it("setPriorityFilter de-duplicates priorities", () => {
     useInboxSignalsFilterStore.getState().setPriorityFilter(["P0", "P1", "P0"]);
 
diff --git a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
index 33f25ef3bb..feb3348114 100644
--- a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
+++ b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
@@ -31,6 +31,10 @@ interface InboxSignalsFilterActions {
   toggleSourceProduct: (source: SourceProduct) => void;
   togglePriority: (priority: SignalReportPriority) => void;
   setPriorityFilter: (priorities: SignalReportPriority[]) => void;
+  /** Clear the source filter back to "Any" (empty = all sources). */
+  clearSourceProductFilter: () => void;
+  /** Clear the priority filter back to "Any" (empty = all priorities). */
+  clearPriorityFilter: () => void;
   /** Reset all filters when a deep link arrives so the linked report isn't hidden. */
   resetFilters: () => void;
 }
@@ -74,6 +78,8 @@ export const useInboxSignalsFilterStore = create<InboxSignalsFilterStore>()(
         set({
           priorityFilter: Array.from(new Set(priorities)),
         }),
+      clearSourceProductFilter: () => set({ sourceProductFilter: [] }),
+      clearPriorityFilter: () => set({ priorityFilter: [] }),
       resetFilters: () =>
         set({
           searchQuery: "",

From 50dabb5b8659563d56477b8189c8ad50a1df5312 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 10:50:46 +0100
Subject: [PATCH 2/8] fix(inbox): drop speculative label prop on
 InboxFilterAnyItem

Generated-By: PostHog Code
Task-Id: 97aa95fe-d9a3-4651-aa9b-9f636fc84832
---
 .../src/features/inbox/components/InboxSearchFilterBar.tsx  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
index 8b728cc06c..846a629c53 100644
--- a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
+++ b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
@@ -80,7 +80,6 @@ export function InboxSearchFilterBar({
       >
         <Flex direction="column" gap="0">
           <InboxFilterAnyItem
-            label="Any"
             active={sourceProductFilter.length === 0}
             onClick={clearSourceProductFilter}
           />
@@ -144,7 +143,6 @@ export function InboxSearchFilterBar({
       >
         <Flex direction="column" gap="0">
           <InboxFilterAnyItem
-            label="Any"
             active={priorityFilter.length === 0}
             onClick={clearPriorityFilter}
           />
@@ -177,17 +175,15 @@ export function InboxSearchFilterBar({
 }
 
 function InboxFilterAnyItem({
-  label,
   active,
   onClick,
 }: {
-  label: string;
   active: boolean;
   onClick: () => void;
 }) {
   return (
     <button type="button" className={FILTER_ITEM_CLASS} onClick={onClick}>
-      <span className="truncate">{label}</span>
+      <span className="truncate">Any</span>
       {active ? (
         <CheckIcon size={12} className="shrink-0 text-gray-12" />
       ) : null}

From 242da082fa707aab5d7fd63e6d199de6874cb998 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 10:59:57 +0100
Subject: [PATCH 3/8] refactor(inbox): drop redundant clearPriorityFilter in
 favor of setPriorityFilter([])

simplify pass: setPriorityFilter([]) already expresses "clear priority to Any", so the dedicated clearPriorityFilter action was pure duplication. clearSourceProductFilter is kept since the source filter has no equivalent setter.

Generated-By: PostHog Code
Task-Id: 97aa95fe-d9a3-4651-aa9b-9f636fc84832
---
 .../src/features/inbox/components/InboxSearchFilterBar.tsx  | 6 +++---
 .../features/inbox/stores/inboxSignalsFilterStore.test.ts   | 4 ++--
 .../ui/src/features/inbox/stores/inboxSignalsFilterStore.ts | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
index 846a629c53..5f49cdc9f7 100644
--- a/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
+++ b/packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
@@ -45,8 +45,8 @@ export function InboxSearchFilterBar({
   );
   const priorityFilter = useInboxSignalsFilterStore((s) => s.priorityFilter);
   const togglePriority = useInboxSignalsFilterStore((s) => s.togglePriority);
-  const clearPriorityFilter = useInboxSignalsFilterStore(
-    (s) => s.clearPriorityFilter,
+  const setPriorityFilter = useInboxSignalsFilterStore(
+    (s) => s.setPriorityFilter,
   );
 
   const activeSort = INBOX_SORT_OPTIONS.find(
@@ -144,7 +144,7 @@ export function InboxSearchFilterBar({
         <Flex direction="column" gap="0">
           <InboxFilterAnyItem
             active={priorityFilter.length === 0}
-            onClick={clearPriorityFilter}
+            onClick={() => setPriorityFilter([])}
           />
           {INBOX_PRIORITY_OPTIONS.map((option) => {
             const isActive = priorityFilter.includes(option.value);
diff --git a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
index 044f913674..25bf6a9f82 100644
--- a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
+++ b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.test.ts
@@ -71,10 +71,10 @@ describe("inboxSignalsFilterStore", () => {
     ]);
   });
 
-  it("clearPriorityFilter resets priorities back to Any (empty)", () => {
+  it("setPriorityFilter resets priorities back to Any (empty)", () => {
     useInboxSignalsFilterStore.getState().setPriorityFilter(["P0", "P1"]);
 
-    useInboxSignalsFilterStore.getState().clearPriorityFilter();
+    useInboxSignalsFilterStore.getState().setPriorityFilter([]);
 
     expect(useInboxSignalsFilterStore.getState().priorityFilter).toEqual([]);
   });
diff --git a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
index feb3348114..921ab26d71 100644
--- a/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
+++ b/packages/ui/src/features/inbox/stores/inboxSignalsFilterStore.ts
@@ -33,8 +33,6 @@ interface InboxSignalsFilterActions {
   setPriorityFilter: (priorities: SignalReportPriority[]) => void;
   /** Clear the source filter back to "Any" (empty = all sources). */
   clearSourceProductFilter: () => void;
-  /** Clear the priority filter back to "Any" (empty = all priorities). */
-  clearPriorityFilter: () => void;
   /** Reset all filters when a deep link arrives so the linked report isn't hidden. */
   resetFilters: () => void;
 }
@@ -79,7 +77,6 @@ export const useInboxSignalsFilterStore = create<InboxSignalsFilterStore>()(
           priorityFilter: Array.from(new Set(priorities)),
         }),
       clearSourceProductFilter: () => set({ sourceProductFilter: [] }),
-      clearPriorityFilter: () => set({ priorityFilter: [] }),
       resetFilters: () =>
         set({
           searchQuery: "",

From 9dada4849fd20203c84bd117cdc4a54a82a4da6a Mon Sep 17 00:00:00 2001
From: Tom Owers <owerstom@gmail.com>
Date: Thu, 16 Jul 2026 11:44:59 +0100
Subject: [PATCH 4/8] feat(mobile): show custom base image badge on cloud task
 detail (port #3492)

Ports the desktop custom base image badge to the React Native app. The task
detail header now shows a violet "cube" badge with the custom sandbox base
image name when a cloud run used a custom image (directly via custom_image_id
or indirectly via its sandbox environment).

The sandbox image and environment lists are fetched through the mobile app's
authed-query pattern, and only when the latest run is a cloud run that carries
a custom_image_id or sandbox_environment_id, so ordinary tasks add no extra
network calls. The badge renders nothing when custom images are disabled or the
image can't be resolved.

Generated-By: PostHog Code
Task-Id: 1230821c-af71-4788-b81f-dcaeb6442e2d
---
 apps/mobile/src/app/task/[id].tsx             |  20 ++-
 apps/mobile/src/features/tasks/api.ts         |  48 ++++++
 .../components/CustomImageBadge.test.tsx      | 147 ++++++++++++++++++
 .../tasks/components/CustomImageBadge.tsx     |  52 +++++++
 .../tasks/hooks/useCustomImageName.ts         |  55 +++++++
 5 files changed, 314 insertions(+), 8 deletions(-)
 create mode 100644 apps/mobile/src/features/tasks/components/CustomImageBadge.test.tsx
 create mode 100644 apps/mobile/src/features/tasks/components/CustomImageBadge.tsx
 create mode 100644 apps/mobile/src/features/tasks/hooks/useCustomImageName.ts

diff --git a/apps/mobile/src/app/task/[id].tsx b/apps/mobile/src/app/task/[id].tsx
index 1375725a49..cd0a4c4843 100644
--- a/apps/mobile/src/app/task/[id].tsx
+++ b/apps/mobile/src/app/task/[id].tsx
@@ -15,6 +15,7 @@ import Animated, { useAnimatedStyle } from "react-native-reanimated";
 import { FloatingBackButton } from "@/components/FloatingBackButton";
 import { usePreferencesStore } from "@/features/preferences/stores/preferencesStore";
 import { getTask, runTaskInCloud } from "@/features/tasks/api";
+import { CustomImageBadge } from "@/features/tasks/components/CustomImageBadge";
 import { FloatingTaskHeader } from "@/features/tasks/components/FloatingTaskHeader";
 import { PrDiffStatsBadge } from "@/features/tasks/components/PrDiffStatsBadge";
 import { PrStatusBadge } from "@/features/tasks/components/PrStatusBadge";
@@ -667,14 +668,17 @@ export default function TaskDetailScreen() {
         title={showLoading ? "Loading..." : task?.title || "Task"}
         subtitle={task?.repository ?? undefined}
         rightSlot={
-          canStopRun ? (
-            <StopRunButton onPress={handleStopRun} />
-          ) : prUrl ? (
-            <>
-              <PrDiffStatsBadge prUrl={prUrl} />
-              <PrStatusBadge prUrl={prUrl} />
-            </>
-          ) : null
+          <>
+            {task ? <CustomImageBadge task={task} /> : null}
+            {canStopRun ? (
+              <StopRunButton onPress={handleStopRun} />
+            ) : prUrl ? (
+              <>
+                <PrDiffStatsBadge prUrl={prUrl} />
+                <PrStatusBadge prUrl={prUrl} />
+              </>
+            ) : null}
+          </>
         }
       />
       <Animated.View className="flex-1" style={contentPosition}>
diff --git a/apps/mobile/src/features/tasks/api.ts b/apps/mobile/src/features/tasks/api.ts
index e2833e505e..6952fde9f6 100644
--- a/apps/mobile/src/features/tasks/api.ts
+++ b/apps/mobile/src/features/tasks/api.ts
@@ -1,4 +1,8 @@
 import type { Adapter } from "@posthog/shared";
+import type {
+  SandboxCustomImage,
+  SandboxEnvironment,
+} from "@posthog/shared/domain-types";
 import { fetch } from "expo/fetch";
 import {
   authedFetch,
@@ -779,6 +783,50 @@ export async function streamCloudTask(
   });
 }
 
+export async function getSandboxCustomImages(): Promise<SandboxCustomImage[]> {
+  const baseUrl = getBaseUrl();
+  const projectId = getProjectId();
+
+  const response = await authedFetch(
+    `${baseUrl}/api/projects/${projectId}/sandbox_custom_images/`,
+  );
+
+  if (!response.ok) {
+    throw new HttpError(
+      response.status,
+      response.statusText,
+      "Failed to fetch sandbox custom images",
+    );
+  }
+
+  const data = await parseJsonResponse<{ results?: SandboxCustomImage[] }>(
+    response,
+  );
+  return data.results ?? [];
+}
+
+export async function getSandboxEnvironments(): Promise<SandboxEnvironment[]> {
+  const baseUrl = getBaseUrl();
+  const projectId = getProjectId();
+
+  const response = await authedFetch(
+    `${baseUrl}/api/projects/${projectId}/sandbox_environments/`,
+  );
+
+  if (!response.ok) {
+    throw new HttpError(
+      response.status,
+      response.statusText,
+      "Failed to fetch sandbox environments",
+    );
+  }
+
+  const data = await parseJsonResponse<{ results?: SandboxEnvironment[] }>(
+    response,
+  );
+  return data.results ?? [];
+}
+
 export async function getIntegrations(): Promise<Integration[]> {
   const baseUrl = getBaseUrl();
   const projectId = getProjectId();
diff --git a/apps/mobile/src/features/tasks/components/CustomImageBadge.test.tsx b/apps/mobile/src/features/tasks/components/CustomImageBadge.test.tsx
new file mode 100644
index 0000000000..09b0531b6c
--- /dev/null
+++ b/apps/mobile/src/features/tasks/components/CustomImageBadge.test.tsx
@@ -0,0 +1,147 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { createElement } from "react";
+import { act, create } from "react-test-renderer";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Task, TaskRun } from "../types";
+
+const { mockUseAuthStore, mockGetImages, mockGetEnvironments } = vi.hoisted(
+  () => ({
+    mockUseAuthStore: vi.fn(),
+    mockGetImages: vi.fn(),
+    mockGetEnvironments: vi.fn(),
+  }),
+);
+
+vi.mock("@/features/auth", () => ({ useAuthStore: mockUseAuthStore }));
+
+vi.mock("../api", () => ({
+  getSandboxCustomImages: mockGetImages,
+  getSandboxEnvironments: mockGetEnvironments,
+}));
+
+vi.mock("phosphor-react-native", () => ({
+  Cube: (props: Record<string, unknown>) => createElement("Cube", props),
+}));
+
+vi.mock("@/lib/theme", () => ({
+  toRgba: (hex: string, alpha: number) => `${hex}/${alpha}`,
+}));
+
+import { CustomImageBadge } from "./CustomImageBadge";
+
+function makeTask(run: Partial<TaskRun> | undefined): Task {
+  return {
+    id: "task-1",
+    task_number: 1,
+    slug: "task-1",
+    title: "Task",
+    description: "",
+    created_at: "2026-01-01T00:00:00Z",
+    updated_at: "2026-01-01T00:00:00Z",
+    origin_product: "user_created",
+    latest_run: run
+      ? ({
+          id: "run-1",
+          task: "task-1",
+          team: 1,
+          branch: null,
+          status: "completed",
+          log_url: "",
+          error_message: null,
+          output: null,
+          state: {},
+          created_at: "2026-01-01T00:00:00Z",
+          updated_at: "2026-01-01T00:00:00Z",
+          completed_at: null,
+          ...run,
+        } as TaskRun)
+      : undefined,
+  };
+}
+
+async function render(task: Task) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  });
+  let renderer: ReturnType<typeof create> | null = null;
+  await act(async () => {
+    renderer = create(
+      createElement(
+        QueryClientProvider,
+        { client: queryClient },
+        createElement(CustomImageBadge, { task }),
+      ),
+    );
+  });
+  // Flush pending react-query resolutions so a resolved image name renders.
+  await act(async () => {
+    await Promise.resolve();
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+  if (!renderer) throw new Error("Renderer not created");
+  return renderer as ReturnType<typeof create>;
+}
+
+function label(renderer: ReturnType<typeof create>): string | undefined {
+  const node = renderer.root.findAll(
+    (n) => typeof n.props?.accessibilityLabel === "string",
+  )[0];
+  return node?.props.accessibilityLabel as string | undefined;
+}
+
+describe("CustomImageBadge", () => {
+  beforeEach(() => {
+    mockUseAuthStore.mockReturnValue({
+      projectId: 1,
+      oauthAccessToken: "token",
+    });
+    mockGetImages.mockReset();
+    mockGetEnvironments.mockReset();
+    mockGetImages.mockResolvedValue([]);
+    mockGetEnvironments.mockResolvedValue([]);
+  });
+
+  it("renders nothing for a local run", async () => {
+    const r = await render(
+      makeTask({ environment: "local", state: { custom_image_id: "img-1" } }),
+    );
+    expect(r.toJSON()).toBeNull();
+    expect(mockGetImages).not.toHaveBeenCalled();
+  });
+
+  it("renders nothing for a cloud run without a custom image id", async () => {
+    const r = await render(makeTask({ environment: "cloud", state: {} }));
+    expect(r.toJSON()).toBeNull();
+    expect(mockGetImages).not.toHaveBeenCalled();
+  });
+
+  it("resolves the image name from a direct custom_image_id", async () => {
+    mockGetImages.mockResolvedValue([{ id: "img-1", name: "My Image" }]);
+    const r = await render(
+      makeTask({ environment: "cloud", state: { custom_image_id: "img-1" } }),
+    );
+    expect(label(r)).toBe('Runs on custom base image "My Image"');
+  });
+
+  it("resolves the image name via sandbox_environment_id", async () => {
+    mockGetEnvironments.mockResolvedValue([
+      { id: "env-1", custom_image_id: "img-2", custom_image_name: null },
+    ]);
+    mockGetImages.mockResolvedValue([{ id: "img-2", name: "Env Image" }]);
+    const r = await render(
+      makeTask({
+        environment: "cloud",
+        state: { sandbox_environment_id: "env-1" },
+      }),
+    );
+    expect(label(r)).toBe('Runs on custom base image "Env Image"');
+  });
+
+  it("renders nothing when the image cannot be resolved", async () => {
+    mockGetImages.mockResolvedValue([{ id: "other", name: "Other" }]);
+    const r = await render(
+      makeTask({ environment: "cloud", state: { custom_image_id: "missing" } }),
+    );
+    expect(r.toJSON()).toBeNull();
+  });
+});
diff --git a/apps/mobile/src/features/tasks/components/CustomImageBadge.tsx b/apps/mobile/src/features/tasks/components/CustomImageBadge.tsx
new file mode 100644
index 0000000000..2e382c228b
--- /dev/null
+++ b/apps/mobile/src/features/tasks/components/CustomImageBadge.tsx
@@ -0,0 +1,52 @@
+import { Text } from "@components/text";
+import { Cube } from "phosphor-react-native";
+import { View } from "react-native";
+import { toRgba } from "@/lib/theme";
+import { useCustomImageName } from "../hooks/useCustomImageName";
+import type { Task } from "../types";
+
+// Theme tokens have no violet; a fixed Radix violet-9 mirrors the desktop
+// custom-image badge and reads well in both light and dark.
+const VIOLET = "#6e56cf";
+
+export function CustomImageBadge({ task }: { task: Task }) {
+  const run = task.latest_run;
+  const state = run?.state as
+    | { custom_image_id?: unknown; sandbox_environment_id?: unknown }
+    | undefined;
+  const customImageId =
+    typeof state?.custom_image_id === "string" ? state.custom_image_id : null;
+  const sandboxEnvironmentId =
+    typeof state?.sandbox_environment_id === "string"
+      ? state.sandbox_environment_id
+      : null;
+
+  const imageName = useCustomImageName({
+    customImageId,
+    sandboxEnvironmentId,
+    enabled: run?.environment === "cloud",
+  });
+
+  if (!imageName) return null;
+
+  return (
+    <View
+      className="h-9 max-w-[160px] flex-row items-center gap-1 rounded-lg border px-2.5"
+      style={{
+        backgroundColor: toRgba(VIOLET, 0.12),
+        borderColor: toRgba(VIOLET, 0.35),
+      }}
+      accessibilityRole="text"
+      accessibilityLabel={`Runs on custom base image "${imageName}"`}
+    >
+      <Cube size={14} weight="fill" color={VIOLET} />
+      <Text
+        numberOfLines={1}
+        className="font-semibold text-[13px]"
+        style={{ color: VIOLET }}
+      >
+        {imageName}
+      </Text>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/tasks/hooks/useCustomImageName.ts b/apps/mobile/src/features/tasks/hooks/useCustomImageName.ts
new file mode 100644
index 0000000000..a634ecd5e6
--- /dev/null
+++ b/apps/mobile/src/features/tasks/hooks/useCustomImageName.ts
@@ -0,0 +1,55 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAuthStore } from "@/features/auth";
+import { getSandboxCustomImages, getSandboxEnvironments } from "../api";
+
+export const sandboxKeys = {
+  customImages: () => ["sandbox-custom-images"] as const,
+  environments: () => ["sandbox-environments"] as const,
+};
+
+interface UseCustomImageNameArgs {
+  customImageId: string | null;
+  sandboxEnvironmentId: string | null;
+  enabled: boolean;
+}
+
+// Returns null while loading, when the fetch fails (custom images disabled), or
+// when the image can't be resolved — in every case the badge renders nothing.
+export function useCustomImageName({
+  customImageId,
+  sandboxEnvironmentId,
+  enabled,
+}: UseCustomImageNameArgs): string | null {
+  const { projectId, oauthAccessToken } = useAuthStore();
+  const canQuery = enabled && !!projectId && !!oauthAccessToken;
+  const hasImageRef = !!customImageId || !!sandboxEnvironmentId;
+
+  const imagesQuery = useQuery({
+    queryKey: sandboxKeys.customImages(),
+    queryFn: getSandboxCustomImages,
+    enabled: canQuery && hasImageRef,
+    staleTime: 60_000,
+    retry: 0,
+  });
+
+  const environmentsQuery = useQuery({
+    queryKey: sandboxKeys.environments(),
+    queryFn: getSandboxEnvironments,
+    enabled: canQuery && !!sandboxEnvironmentId,
+    staleTime: 60_000,
+    retry: 0,
+  });
+
+  const environment = sandboxEnvironmentId
+    ? environmentsQuery.data?.find((env) => env.id === sandboxEnvironmentId)
+    : undefined;
+
+  const imageId = customImageId ?? environment?.custom_image_id ?? null;
+  if (!imageId) return null;
+
+  return (
+    imagesQuery.data?.find((image) => image.id === imageId)?.name ??
+    environment?.custom_image_name ??
+    null
+  );
+}

From d58a256ee4ca528a24a5155d76f46bcf98e84e75 Mon Sep 17 00:00:00 2001
From: Andrew Maguire <andrewm4894@gmail.com>
Date: Thu, 16 Jul 2026 12:05:30 +0100
Subject: [PATCH 5/8] fix(agent): make spoken narration strictly opt-in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Spoken narration defaulted on for all cloud runs via resolveSpokenNarration
falling back to isCloudRun(meta). That loaded the `speak` tool and its prompt
instructions — and prompted the agent to call it — on headless runs (Slack
threads, Signals scouts) where nothing can play audio, costing tokens with no
listener and regardless of the feature flag, user setting, or ElevenLabs key.

Make narration strictly opt-in: resolveSpokenNarration now returns true only
when a caller explicitly sets spokenNarration. The desktop is the only client
that can play audio and knows the flag/setting/key, so it computes that boolean
and passes it; everything else stays silent and never loads the tool. Also
require an ElevenLabs key alongside the setting on the desktop start/reconnect
paths, and refresh the now-stale comments.

Generated-By: PostHog Code
Task-Id: 7a65b8a4-b69d-472f-9753-67d59715e332
---
 .../src/adapters/local-tools/tools/speak.ts   |  9 +++--
 .../agent/src/adapters/session-meta.test.ts   | 37 ++++++++-----------
 packages/agent/src/adapters/session-meta.ts   | 17 +++++----
 packages/core/src/sessions/sessionService.ts  | 16 ++++++--
 .../src/services/agent/schemas.ts             |  5 ++-
 5 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/packages/agent/src/adapters/local-tools/tools/speak.ts b/packages/agent/src/adapters/local-tools/tools/speak.ts
index 83ef123eaf..7763baf0a3 100644
--- a/packages/agent/src/adapters/local-tools/tools/speak.ts
+++ b/packages/agent/src/adapters/local-tools/tools/speak.ts
@@ -48,10 +48,11 @@ export const SPEAK_TOOL_DESCRIPTION =
  * speakers, so it just acknowledges. The desktop renderer observes the
  * surfaced `tool_call` (carrying `text`/`needsUser` in its rawInput) and routes
  * it to the speech queue, exactly like completion/permission notifications are
- * pure side effects off the event stream. Gated on `spokenNarration`: local
- * sessions pass the user's setting at session start, while cloud sessions
- * resolve it to true at the adapter (the sandbox can't know which clients are
- * listening, so cloud emits always and consumers gate playback).
+ * pure side effects off the event stream. Gated on `spokenNarration`, which is
+ * strictly opt-in (see `resolveSpokenNarration`): the desktop passes it true
+ * only when the feature flag, the user's setting, and an ElevenLabs key are all
+ * in place. Headless cloud runs (Slack threads, Signals scouts) never enable
+ * it, so the tool and its instructions never load and never cost tokens there.
  */
 export const speakTool = defineLocalTool({
   name: SPEAK_TOOL_NAME,
diff --git a/packages/agent/src/adapters/session-meta.test.ts b/packages/agent/src/adapters/session-meta.test.ts
index e65730aa00..b3492eece0 100644
--- a/packages/agent/src/adapters/session-meta.test.ts
+++ b/packages/agent/src/adapters/session-meta.test.ts
@@ -6,25 +6,18 @@ describe("resolveSpokenNarration", () => {
     vi.unstubAllEnvs();
   });
 
+  // Narration is strictly opt-in: only an explicit `spokenNarration: true`
+  // enables it. Cloud/sandbox runs no longer default on, so headless runs
+  // (Slack threads, Signals scouts) never load the tool or its instructions.
   it.each([
     {
-      name: "explicit true on local",
-      meta: { environment: "local" as const, spokenNarration: true },
+      name: "explicit true",
+      meta: { spokenNarration: true },
       expected: true,
     },
     {
-      name: "explicit false on cloud",
-      meta: { environment: "cloud" as const, spokenNarration: false },
-      expected: false,
-    },
-    {
-      name: "cloud default",
-      meta: { environment: "cloud" as const },
-      expected: true,
-    },
-    {
-      name: "local default",
-      meta: { environment: "local" as const },
+      name: "explicit false",
+      meta: { spokenNarration: false },
       expected: false,
     },
     { name: "no meta", meta: undefined, expected: false },
@@ -35,20 +28,20 @@ describe("resolveSpokenNarration", () => {
   });
 
   it.each([
-    { name: "no meta", meta: undefined, expected: true },
-    { name: "empty meta", meta: {}, expected: true },
+    { name: "no meta", meta: undefined, expected: false },
+    { name: "empty meta", meta: {}, expected: false },
     {
-      name: "explicit false",
-      meta: { spokenNarration: false },
-      expected: false,
+      name: "explicit true",
+      meta: { spokenNarration: true },
+      expected: true,
     },
     {
-      name: "explicit local environment",
-      meta: { environment: "local" as const },
+      name: "explicit false",
+      meta: { spokenNarration: false },
       expected: false,
     },
   ])(
-    "resolves $name to $expected in a sandbox without an environment tag",
+    "resolves $name to $expected in a sandbox (no default-on)",
     ({ meta, expected }) => {
       vi.stubEnv("IS_SANDBOX", "1");
       expect(resolveSpokenNarration(meta)).toBe(expected);
diff --git a/packages/agent/src/adapters/session-meta.ts b/packages/agent/src/adapters/session-meta.ts
index f70de89744..859d60a818 100644
--- a/packages/agent/src/adapters/session-meta.ts
+++ b/packages/agent/src/adapters/session-meta.ts
@@ -1,5 +1,3 @@
-import { isCloudRun } from "../utils/common";
-
 /** Minimal shape needed to resolve the effective task id from session meta. */
 interface TaskIdSource {
   taskId?: string;
@@ -19,18 +17,21 @@ export function resolveTaskId(
 
 /** Minimal shape needed to resolve spoken narration from session meta. */
 interface SpokenNarrationSource {
-  environment?: "local" | "cloud";
   spokenNarration?: boolean;
 }
 
 /**
- * An explicit setting wins; otherwise cloud runs (including sandbox runs
- * detected via `IS_SANDBOX`) default to on because the sandbox can't know
- * which clients are listening, so consumers gate playback. Local runs stay
- * silent. Shared by the Claude and Codex adapters.
+ * Spoken narration is strictly opt-in: it is on only when a caller explicitly
+ * sets `spokenNarration` true at session start. The desktop is the only client
+ * that can play audio and the only place that knows the feature flag, the
+ * user's setting, and whether an ElevenLabs key is configured — so it computes
+ * that boolean and passes it. Everything else (headless cloud runs like Slack
+ * threads and Signals scouts, sandboxes, local runs without the setting) stays
+ * silent, so the `speak` tool and its instructions never load and never cost
+ * tokens where nothing is listening. Shared by the Claude and Codex adapters.
  */
 export function resolveSpokenNarration(
   meta: SpokenNarrationSource | undefined,
 ): boolean {
-  return meta?.spokenNarration ?? isCloudRun(meta);
+  return meta?.spokenNarration === true;
 }
diff --git a/packages/core/src/sessions/sessionService.ts b/packages/core/src/sessions/sessionService.ts
index f96a13398d..4694203f93 100644
--- a/packages/core/src/sessions/sessionService.ts
+++ b/packages/core/src/sessions/sessionService.ts
@@ -336,6 +336,7 @@ export interface SessionServiceDeps {
     rtkEnabledLocal?: boolean;
     rtkEnabledCloud?: boolean;
     spokenNotifications?: boolean;
+    elevenLabsKeyConfigured?: boolean;
   };
   usageLimit: { show: (...args: any[]) => any };
   readonly addDirectoryDialog: { open: boolean };
@@ -1087,14 +1088,19 @@ export class SessionService {
           this.d.log.warn("Failed to verify workspace", { taskId, err });
         });
 
-      const { customInstructions, rtkEnabledLocal, spokenNotifications } =
-        this.d.settings;
+      const {
+        customInstructions,
+        rtkEnabledLocal,
+        spokenNotifications,
+        elevenLabsKeyConfigured,
+      } = this.d.settings;
       const result = await this.d.trpc.agent.reconnect.mutate({
         taskId,
         taskRunId,
         repoPath,
         rtkEnabled: rtkEnabledLocal,
-        spokenNarration: spokenNotifications === true,
+        spokenNarration:
+          spokenNotifications === true && elevenLabsKeyConfigured === true,
         apiHost: auth.apiHost,
         projectId: auth.projectId,
         logUrl,
@@ -1418,6 +1424,7 @@ export class SessionService {
       customInstructions: startCustomInstructions,
       rtkEnabledLocal,
       spokenNotifications,
+      elevenLabsKeyConfigured,
     } = this.d.settings;
     const preferredModel = model ?? this.d.DEFAULT_GATEWAY_MODEL;
     const result = await this.d.trpc.agent.start.mutate({
@@ -1430,7 +1437,8 @@ export class SessionService {
       adapter,
       customInstructions: startCustomInstructions || undefined,
       rtkEnabled: rtkEnabledLocal,
-      spokenNarration: spokenNotifications === true,
+      spokenNarration:
+        spokenNotifications === true && elevenLabsKeyConfigured === true,
       effort: effortLevelSchema.safeParse(reasoningLevel).success
         ? (reasoningLevel as EffortLevel)
         : undefined,
diff --git a/packages/workspace-server/src/services/agent/schemas.ts b/packages/workspace-server/src/services/agent/schemas.ts
index 9234cd7f6e..066a8314ba 100644
--- a/packages/workspace-server/src/services/agent/schemas.ts
+++ b/packages/workspace-server/src/services/agent/schemas.ts
@@ -93,8 +93,9 @@ export const startSessionInput = z.object({
   rtkEnabled: z.boolean().optional(),
   /**
    * The user's spoken-narration setting at session start. Gates the agent's
-   * speak tool and its prompt instructions; when absent the adapter defaults
-   * by environment (cloud on, local off).
+   * speak tool and its prompt instructions. Strictly opt-in: only the desktop
+   * sets it true (feature flag + setting + ElevenLabs key); when absent the
+   * adapter leaves narration off, so headless runs never load the tool.
    */
   spokenNarration: z.boolean().optional(),
 });

From 539c826cc8fe575519eea90da61286df03d75ee1 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 12:19:45 +0100
Subject: [PATCH 6/8] fix(agent): allow system voice narration fallback

Generated-By: PostHog Code
Task-Id: ac30fada-8c29-4973-a253-08d70be31be6
---
 .../agent/src/adapters/local-tools/tools/speak.ts    |  6 +++---
 packages/agent/src/adapters/session-meta.ts          | 12 ++++++------
 packages/core/src/sessions/sessionService.ts         | 10 +++++-----
 .../ui/src/features/sessions/sessionServiceHost.ts   |  9 +++++++++
 .../workspace-server/src/services/agent/schemas.ts   |  4 ++--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/agent/src/adapters/local-tools/tools/speak.ts b/packages/agent/src/adapters/local-tools/tools/speak.ts
index 7763baf0a3..44f31320a0 100644
--- a/packages/agent/src/adapters/local-tools/tools/speak.ts
+++ b/packages/agent/src/adapters/local-tools/tools/speak.ts
@@ -50,9 +50,9 @@ export const SPEAK_TOOL_DESCRIPTION =
  * it to the speech queue, exactly like completion/permission notifications are
  * pure side effects off the event stream. Gated on `spokenNarration`, which is
  * strictly opt-in (see `resolveSpokenNarration`): the desktop passes it true
- * only when the feature flag, the user's setting, and an ElevenLabs key are all
- * in place. Headless cloud runs (Slack threads, Signals scouts) never enable
- * it, so the tool and its instructions never load and never cost tokens there.
+ * only when the feature flag and the user's setting are both enabled. Headless
+ * cloud runs (Slack threads, Signals scouts) never enable it, so the tool and
+ * its instructions never load and never cost tokens there.
  */
 export const speakTool = defineLocalTool({
   name: SPEAK_TOOL_NAME,
diff --git a/packages/agent/src/adapters/session-meta.ts b/packages/agent/src/adapters/session-meta.ts
index 859d60a818..a4ccf9fdde 100644
--- a/packages/agent/src/adapters/session-meta.ts
+++ b/packages/agent/src/adapters/session-meta.ts
@@ -23,12 +23,12 @@ interface SpokenNarrationSource {
 /**
  * Spoken narration is strictly opt-in: it is on only when a caller explicitly
  * sets `spokenNarration` true at session start. The desktop is the only client
- * that can play audio and the only place that knows the feature flag, the
- * user's setting, and whether an ElevenLabs key is configured — so it computes
- * that boolean and passes it. Everything else (headless cloud runs like Slack
- * threads and Signals scouts, sandboxes, local runs without the setting) stays
- * silent, so the `speak` tool and its instructions never load and never cost
- * tokens where nothing is listening. Shared by the Claude and Codex adapters.
+ * that can play audio and the only place that knows the feature flag and the
+ * user's setting, so it computes that boolean and passes it. Everything else
+ * (headless cloud runs like Slack threads and Signals scouts, sandboxes, local
+ * runs without the setting) stays silent, so the `speak` tool and its
+ * instructions never load and never cost tokens where nothing is listening.
+ * Shared by the Claude and Codex adapters.
  */
 export function resolveSpokenNarration(
   meta: SpokenNarrationSource | undefined,
diff --git a/packages/core/src/sessions/sessionService.ts b/packages/core/src/sessions/sessionService.ts
index 4694203f93..d27cf9086b 100644
--- a/packages/core/src/sessions/sessionService.ts
+++ b/packages/core/src/sessions/sessionService.ts
@@ -336,7 +336,7 @@ export interface SessionServiceDeps {
     rtkEnabledLocal?: boolean;
     rtkEnabledCloud?: boolean;
     spokenNotifications?: boolean;
-    elevenLabsKeyConfigured?: boolean;
+    spokenNarrationEnabled?: boolean;
   };
   usageLimit: { show: (...args: any[]) => any };
   readonly addDirectoryDialog: { open: boolean };
@@ -1092,7 +1092,7 @@ export class SessionService {
         customInstructions,
         rtkEnabledLocal,
         spokenNotifications,
-        elevenLabsKeyConfigured,
+        spokenNarrationEnabled,
       } = this.d.settings;
       const result = await this.d.trpc.agent.reconnect.mutate({
         taskId,
@@ -1100,7 +1100,7 @@ export class SessionService {
         repoPath,
         rtkEnabled: rtkEnabledLocal,
         spokenNarration:
-          spokenNotifications === true && elevenLabsKeyConfigured === true,
+          spokenNotifications === true && spokenNarrationEnabled === true,
         apiHost: auth.apiHost,
         projectId: auth.projectId,
         logUrl,
@@ -1424,7 +1424,7 @@ export class SessionService {
       customInstructions: startCustomInstructions,
       rtkEnabledLocal,
       spokenNotifications,
-      elevenLabsKeyConfigured,
+      spokenNarrationEnabled,
     } = this.d.settings;
     const preferredModel = model ?? this.d.DEFAULT_GATEWAY_MODEL;
     const result = await this.d.trpc.agent.start.mutate({
@@ -1438,7 +1438,7 @@ export class SessionService {
       customInstructions: startCustomInstructions || undefined,
       rtkEnabled: rtkEnabledLocal,
       spokenNarration:
-        spokenNotifications === true && elevenLabsKeyConfigured === true,
+        spokenNotifications === true && spokenNarrationEnabled === true,
       effort: effortLevelSchema.safeParse(reasoningLevel).success
         ? (reasoningLevel as EffortLevel)
         : undefined,
diff --git a/packages/ui/src/features/sessions/sessionServiceHost.ts b/packages/ui/src/features/sessions/sessionServiceHost.ts
index 44bfc7a9f7..7aecf3caab 100644
--- a/packages/ui/src/features/sessions/sessionServiceHost.ts
+++ b/packages/ui/src/features/sessions/sessionServiceHost.ts
@@ -15,12 +15,17 @@ import {
   HOST_TRPC_CLIENT,
   type HostTrpcClient,
 } from "@posthog/host-router/client";
+import { SPOKEN_NARRATION_FLAG } from "@posthog/shared";
 import {
   createAuthenticatedClient,
   getAuthenticatedClient,
 } from "@posthog/ui/features/auth/authClientImperative";
 import { fetchAuthState } from "@posthog/ui/features/auth/authQueries";
 import { useUsageLimitStore } from "@posthog/ui/features/billing/usageLimitStore";
+import {
+  FEATURE_FLAGS,
+  type FeatureFlags,
+} from "@posthog/ui/features/feature-flags/identifiers";
 import { useAddDirectoryDialogStore } from "@posthog/ui/features/folder-picker/addDirectoryDialogStore";
 import { NotificationBus } from "@posthog/ui/features/notifications/notifications";
 import { SpeechNotifier } from "@posthog/ui/features/notifications/speechNotifier";
@@ -117,6 +122,10 @@ function buildSessionServiceDeps(): SessionServiceDeps {
       return {
         ...state,
         customInstructions: getEffectiveCustomInstructions(state),
+        spokenNarrationEnabled:
+          resolveService<FeatureFlags>(FEATURE_FLAGS).isEnabled(
+            SPOKEN_NARRATION_FLAG,
+          ) || import.meta.env.DEV,
       };
     },
     usageLimit: {
diff --git a/packages/workspace-server/src/services/agent/schemas.ts b/packages/workspace-server/src/services/agent/schemas.ts
index 066a8314ba..5d8eeab508 100644
--- a/packages/workspace-server/src/services/agent/schemas.ts
+++ b/packages/workspace-server/src/services/agent/schemas.ts
@@ -94,8 +94,8 @@ export const startSessionInput = z.object({
   /**
    * The user's spoken-narration setting at session start. Gates the agent's
    * speak tool and its prompt instructions. Strictly opt-in: only the desktop
-   * sets it true (feature flag + setting + ElevenLabs key); when absent the
-   * adapter leaves narration off, so headless runs never load the tool.
+   * sets it true (feature flag + setting); when absent the adapter leaves
+   * narration off, so headless runs never load the tool.
    */
   spokenNarration: z.boolean().optional(),
 });

From f6aec6ccee9fe2989f5b4ddb8b7a021e3e98322b Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 12:43:42 +0100
Subject: [PATCH 7/8] fix(agent): preserve narration opt-in for cloud runs

Generated-By: PostHog Code
Task-Id: ac30fada-8c29-4973-a253-08d70be31be6
---
 .../agent/src/adapters/session-meta.test.ts   | 19 ++++++-
 packages/agent/src/adapters/session-meta.ts   | 10 ++++
 packages/agent/src/server/agent-server.ts     |  2 +
 .../api-client/src/posthog-client.test.ts     |  2 +
 packages/api-client/src/posthog-client.ts     |  5 ++
 packages/core/src/sessions/sessionService.ts  | 16 ++----
 .../src/task-detail/taskCreationApiClient.ts  |  1 +
 .../src/task-detail/taskCreationSaga.test.ts  |  2 +
 .../core/src/task-detail/taskCreationSaga.ts  |  1 +
 .../core/src/task-detail/taskInput.test.ts    | 15 +++++
 packages/core/src/task-detail/taskInput.ts    |  2 +
 packages/shared/src/task-creation-domain.ts   |  2 +
 .../sessions/sessionServiceHost.test.ts       | 56 ++++++++++++++++++-
 .../features/sessions/sessionServiceHost.ts   | 15 ++++-
 .../task-detail/hooks/useTaskCreation.ts      |  8 +++
 15 files changed, 141 insertions(+), 15 deletions(-)

diff --git a/packages/agent/src/adapters/session-meta.test.ts b/packages/agent/src/adapters/session-meta.test.ts
index b3492eece0..59617defe7 100644
--- a/packages/agent/src/adapters/session-meta.test.ts
+++ b/packages/agent/src/adapters/session-meta.test.ts
@@ -1,5 +1,8 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { resolveSpokenNarration } from "./session-meta";
+import {
+  resolveCloudSpokenNarration,
+  resolveSpokenNarration,
+} from "./session-meta";
 
 describe("resolveSpokenNarration", () => {
   afterEach(() => {
@@ -48,3 +51,17 @@ describe("resolveSpokenNarration", () => {
     },
   );
 });
+
+describe("resolveCloudSpokenNarration", () => {
+  it.each([
+    { state: { spoken_narration: true }, expected: true },
+    { state: { spoken_narration: false }, expected: false },
+    { state: {}, expected: false },
+    { state: undefined, expected: false },
+  ])(
+    "resolves explicit cloud run opt-in to $expected",
+    ({ state, expected }) => {
+      expect(resolveCloudSpokenNarration(state)).toBe(expected);
+    },
+  );
+});
diff --git a/packages/agent/src/adapters/session-meta.ts b/packages/agent/src/adapters/session-meta.ts
index a4ccf9fdde..fe126c37e9 100644
--- a/packages/agent/src/adapters/session-meta.ts
+++ b/packages/agent/src/adapters/session-meta.ts
@@ -20,6 +20,10 @@ interface SpokenNarrationSource {
   spokenNarration?: boolean;
 }
 
+interface SpokenNarrationRunState {
+  spoken_narration?: unknown;
+}
+
 /**
  * Spoken narration is strictly opt-in: it is on only when a caller explicitly
  * sets `spokenNarration` true at session start. The desktop is the only client
@@ -35,3 +39,9 @@ export function resolveSpokenNarration(
 ): boolean {
   return meta?.spokenNarration === true;
 }
+
+export function resolveCloudSpokenNarration(
+  state: SpokenNarrationRunState | undefined,
+): boolean {
+  return state?.spoken_narration === true;
+}
diff --git a/packages/agent/src/server/agent-server.ts b/packages/agent/src/server/agent-server.ts
index a8a0b25d4e..c9fdbb8a50 100644
--- a/packages/agent/src/server/agent-server.ts
+++ b/packages/agent/src/server/agent-server.ts
@@ -45,6 +45,7 @@ import {
   classifyAgentError,
   isPromptTooLongError,
 } from "../adapters/error-classification";
+import { resolveCloudSpokenNarration } from "../adapters/session-meta";
 import {
   SIGNED_COMMIT_QUALIFIED_TOOL_NAME,
   SIGNED_MERGE_QUALIFIED_TOOL_NAME,
@@ -1497,6 +1498,7 @@ export class AgentServer {
       allowedDomains: this.config.allowedDomains,
       jsonSchema: preTask?.json_schema ?? null,
       permissionMode: initialPermissionMode,
+      spokenNarration: resolveCloudSpokenNarration(runState),
       ...(this.config.baseBranch && { baseBranch: this.config.baseBranch }),
       ...this.buildClaudeCodeSessionMeta(runtimeAdapter),
     };
diff --git a/packages/api-client/src/posthog-client.test.ts b/packages/api-client/src/posthog-client.test.ts
index 8c29ded301..b8b3981038 100644
--- a/packages/api-client/src/posthog-client.test.ts
+++ b/packages/api-client/src/posthog-client.test.ts
@@ -25,6 +25,7 @@ describe("PostHogAPIClient", () => {
       adapter: "codex",
       model: "gpt-5.4",
       reasoningLevel: "high",
+      spokenNarration: true,
     });
 
     expect(post).toHaveBeenCalledWith(
@@ -37,6 +38,7 @@ describe("PostHogAPIClient", () => {
           runtime_adapter: "codex",
           model: "gpt-5.4",
           reasoning_effort: "high",
+          spoken_narration: true,
         }),
       }),
     );
diff --git a/packages/api-client/src/posthog-client.ts b/packages/api-client/src/posthog-client.ts
index 7543fb83d4..d99d58f081 100644
--- a/packages/api-client/src/posthog-client.ts
+++ b/packages/api-client/src/posthog-client.ts
@@ -613,6 +613,8 @@ interface CloudRunOptions {
   autoPublish?: boolean;
   /** Only false is sent: opts the run out of rtk command-output compression. */
   rtkEnabled?: boolean;
+  /** Explicit desktop opt-in; omitted for headless/background callers. */
+  spokenNarration?: boolean;
   runSource?: CloudRunSource;
   signalReportId?: string;
   initialPermissionMode?: ExecutionMode;
@@ -708,6 +710,9 @@ function buildCloudRunRequestBody(
   if (options?.rtkEnabled === false) {
     body.rtk_enabled = false;
   }
+  if (options?.spokenNarration !== undefined) {
+    body.spoken_narration = options.spokenNarration;
+  }
   if (options?.runSource) {
     body.run_source = options.runSource;
   }
diff --git a/packages/core/src/sessions/sessionService.ts b/packages/core/src/sessions/sessionService.ts
index d27cf9086b..df868c43b4 100644
--- a/packages/core/src/sessions/sessionService.ts
+++ b/packages/core/src/sessions/sessionService.ts
@@ -1088,19 +1088,14 @@ export class SessionService {
           this.d.log.warn("Failed to verify workspace", { taskId, err });
         });
 
-      const {
-        customInstructions,
-        rtkEnabledLocal,
-        spokenNotifications,
-        spokenNarrationEnabled,
-      } = this.d.settings;
+      const { customInstructions, rtkEnabledLocal, spokenNarrationEnabled } =
+        this.d.settings;
       const result = await this.d.trpc.agent.reconnect.mutate({
         taskId,
         taskRunId,
         repoPath,
         rtkEnabled: rtkEnabledLocal,
-        spokenNarration:
-          spokenNotifications === true && spokenNarrationEnabled === true,
+        spokenNarration: spokenNarrationEnabled === true,
         apiHost: auth.apiHost,
         projectId: auth.projectId,
         logUrl,
@@ -1423,7 +1418,6 @@ export class SessionService {
     const {
       customInstructions: startCustomInstructions,
       rtkEnabledLocal,
-      spokenNotifications,
       spokenNarrationEnabled,
     } = this.d.settings;
     const preferredModel = model ?? this.d.DEFAULT_GATEWAY_MODEL;
@@ -1437,8 +1431,7 @@ export class SessionService {
       adapter,
       customInstructions: startCustomInstructions || undefined,
       rtkEnabled: rtkEnabledLocal,
-      spokenNarration:
-        spokenNotifications === true && spokenNarrationEnabled === true,
+      spokenNarration: spokenNarrationEnabled === true,
       effort: effortLevelSchema.safeParse(reasoningLevel).success
         ? (reasoningLevel as EffortLevel)
         : undefined,
@@ -3415,6 +3408,7 @@ export class SessionService {
           prAuthorshipMode,
           autoPublish: previousState.auto_publish === true || undefined,
           rtkEnabled: this.d.settings.rtkEnabledCloud,
+          spokenNarration: this.d.settings.spokenNarrationEnabled === true,
           runSource: getCloudRunSource(previousState),
           signalReportId:
             typeof previousState.signal_report_id === "string"
diff --git a/packages/core/src/task-detail/taskCreationApiClient.ts b/packages/core/src/task-detail/taskCreationApiClient.ts
index b09c5f75d2..2045ad657f 100644
--- a/packages/core/src/task-detail/taskCreationApiClient.ts
+++ b/packages/core/src/task-detail/taskCreationApiClient.ts
@@ -19,6 +19,7 @@ export interface CreateTaskRunClientOptions {
   prAuthorshipMode?: PrAuthorshipMode;
   autoPublish?: boolean;
   rtkEnabled?: boolean;
+  spokenNarration?: boolean;
   runSource?: CloudRunSource;
   signalReportId?: string;
   initialPermissionMode?: string;
diff --git a/packages/core/src/task-detail/taskCreationSaga.test.ts b/packages/core/src/task-detail/taskCreationSaga.test.ts
index f3d626053a..33d785fd8a 100644
--- a/packages/core/src/task-detail/taskCreationSaga.test.ts
+++ b/packages/core/src/task-detail/taskCreationSaga.test.ts
@@ -154,6 +154,7 @@ describe("TaskCreationSaga", () => {
       reasoningLevel: "high",
       cloudAutoPublish: true,
       cloudRtkEnabled: false,
+      spokenNarration: true,
     });
 
     expect(result.success).toBe(true);
@@ -172,6 +173,7 @@ describe("TaskCreationSaga", () => {
       prAuthorshipMode: "user",
       autoPublish: true,
       rtkEnabled: false,
+      spokenNarration: true,
       runSource: "manual",
       signalReportId: undefined,
       initialPermissionMode: "auto",
diff --git a/packages/core/src/task-detail/taskCreationSaga.ts b/packages/core/src/task-detail/taskCreationSaga.ts
index b3e0c5218a..82bd07f724 100644
--- a/packages/core/src/task-detail/taskCreationSaga.ts
+++ b/packages/core/src/task-detail/taskCreationSaga.ts
@@ -404,6 +404,7 @@ export class TaskCreationSaga extends Saga<
             prAuthorshipMode,
             autoPublish: input.cloudAutoPublish,
             rtkEnabled: input.cloudRtkEnabled,
+            spokenNarration: input.spokenNarration,
             runSource: input.cloudRunSource ?? "manual",
             signalReportId: input.signalReportId,
             homeQuickAction: input.homeQuickActionLabel,
diff --git a/packages/core/src/task-detail/taskInput.test.ts b/packages/core/src/task-detail/taskInput.test.ts
index f45243d608..5d0b6b293d 100644
--- a/packages/core/src/task-detail/taskInput.test.ts
+++ b/packages/core/src/task-detail/taskInput.test.ts
@@ -27,4 +27,19 @@ describe("prepareTaskInput", () => {
     });
     expect(input.customInstructions).toBeUndefined();
   });
+
+  it.each([
+    { workspaceMode: "cloud" as const, expected: true },
+    { workspaceMode: "local" as const, expected: undefined },
+    { workspaceMode: "worktree" as const, expected: undefined },
+  ])(
+    "passes spoken narration through only for cloud (%s)",
+    ({ workspaceMode, expected }) => {
+      const input = prepareTaskInput("do the thing", [], {
+        workspaceMode,
+        spokenNarration: true,
+      });
+      expect(input.spokenNarration).toBe(expected);
+    },
+  );
 });
diff --git a/packages/core/src/task-detail/taskInput.ts b/packages/core/src/task-detail/taskInput.ts
index 73bc9550d8..66d93f3d57 100644
--- a/packages/core/src/task-detail/taskInput.ts
+++ b/packages/core/src/task-detail/taskInput.ts
@@ -32,6 +32,7 @@ export interface PrepareTaskInputOptions {
   customInstructions?: string;
   autoPublishCloudRuns?: boolean;
   rtkEnabledCloud?: boolean;
+  spokenNarration?: boolean;
   allowNoRepo?: boolean;
   importedMcpServers?: CloudMcpServerImport[];
   relayedMcpServers?: CloudMcpServerRelayDesignation[];
@@ -70,6 +71,7 @@ export function prepareTaskInput(
       options.signalReportId && isCloud ? "signal_report" : undefined,
     cloudAutoPublish: isCloud ? options.autoPublishCloudRuns : undefined,
     cloudRtkEnabled: isCloud ? options.rtkEnabledCloud : undefined,
+    spokenNarration: isCloud ? options.spokenNarration : undefined,
     signalReportId: options.signalReportId,
     additionalDirectories: isCloud ? undefined : options.additionalDirectories,
     channelContext: options.channelContext,
diff --git a/packages/shared/src/task-creation-domain.ts b/packages/shared/src/task-creation-domain.ts
index 8b073027a9..e3fd2a9269 100644
--- a/packages/shared/src/task-creation-domain.ts
+++ b/packages/shared/src/task-creation-domain.ts
@@ -52,6 +52,8 @@ export interface TaskCreationInput {
    * meaningful: it opts the run out of the server-side default (enabled).
    */
   cloudRtkEnabled?: boolean;
+  /** Explicit desktop opt-in for spoken narration in interactive cloud runs. */
+  spokenNarration?: boolean;
   signalReportId?: string;
   additionalDirectories?: string[];
   /**
diff --git a/packages/ui/src/features/sessions/sessionServiceHost.test.ts b/packages/ui/src/features/sessions/sessionServiceHost.test.ts
index c17203b38b..d71fd2f14b 100644
--- a/packages/ui/src/features/sessions/sessionServiceHost.test.ts
+++ b/packages/ui/src/features/sessions/sessionServiceHost.test.ts
@@ -236,8 +236,14 @@ const mockSpeechNotifier = vi.hoisted(() => ({
   speak: vi.fn(),
 }));
 
+const mockFeatureFlags = vi.hoisted(() => ({
+  isEnabled: vi.fn(() => false),
+  onFlagsLoaded: vi.fn(() => vi.fn()),
+}));
+
 const mockSettingsState = vi.hoisted(() => ({
   customInstructions: "",
+  spokenNotifications: false,
   syncCustomInstructionsFromFile: false,
   syncedCustomInstructions: null as {
     path: string;
@@ -314,6 +320,9 @@ vi.mock("@posthog/di/container", () => ({
     if (typeof token === "function" && token.name === "SpeechNotifier") {
       return mockSpeechNotifier;
     }
+    if (token === Symbol.for("posthog.ui.featureFlags")) {
+      return mockFeatureFlags;
+    }
     throw new Error(`resolveService: unmocked token ${String(token)}`);
   },
 }));
@@ -382,7 +391,11 @@ vi.mock("@posthog/core/sessions/sessionEvents", async () => {
 });
 
 import { toast } from "@posthog/ui/primitives/toast";
-import { getSessionService, resetSessionService } from "./sessionServiceHost";
+import {
+  getSessionService,
+  resetSessionService,
+  shouldEnableSpokenNarration,
+} from "./sessionServiceHost";
 
 // --- Test Fixtures ---
 
@@ -426,6 +439,8 @@ describe("SessionService", () => {
     mockConvertStoredEntriesToEvents.mockImplementation(() => []);
     resetSessionService();
     mockSettingsState.customInstructions = "";
+    mockSettingsState.spokenNotifications = false;
+    mockFeatureFlags.isEnabled.mockReturnValue(false);
     mockSettingsState.syncCustomInstructionsFromFile = false;
     mockSettingsState.syncedCustomInstructions = null;
     mockGetIsOnline.mockReturnValue(true);
@@ -514,6 +529,42 @@ describe("SessionService", () => {
     });
   });
 
+  describe("spoken narration availability", () => {
+    it.each([
+      {
+        userOptedIn: true,
+        flagEnabled: true,
+        isDevelopment: false,
+        expected: true,
+      },
+      {
+        userOptedIn: false,
+        flagEnabled: true,
+        isDevelopment: false,
+        expected: false,
+      },
+      {
+        userOptedIn: true,
+        flagEnabled: false,
+        isDevelopment: false,
+        expected: false,
+      },
+      {
+        userOptedIn: true,
+        flagEnabled: false,
+        isDevelopment: true,
+        expected: true,
+      },
+    ])(
+      "returns $expected for opt-in=$userOptedIn flag=$flagEnabled dev=$isDevelopment",
+      ({ userOptedIn, flagEnabled, isDevelopment, expected }) => {
+        expect(
+          shouldEnableSpokenNarration(userOptedIn, flagEnabled, isDevelopment),
+        ).toBe(expected);
+      },
+    );
+  });
+
   describe("connectToTask", () => {
     it("skips local connection for cloud runs", async () => {
       const service = getSessionService();
@@ -5036,6 +5087,8 @@ describe("SessionService", () => {
 
     it("preserves codex runtime selection when resuming a terminal cloud run", async () => {
       const service = getSessionService();
+      mockSettingsState.spokenNotifications = true;
+      mockFeatureFlags.isEnabled.mockReturnValue(true);
       mockSessionStoreSetters.getSessionByTaskId.mockReturnValue(
         createMockSession({
           isCloud: true,
@@ -5124,6 +5177,7 @@ describe("SessionService", () => {
           model: "gpt-5.4",
           reasoningLevel: "high",
           resumeFromRunId: "run-123",
+          spokenNarration: true,
         }),
       );
     });
diff --git a/packages/ui/src/features/sessions/sessionServiceHost.ts b/packages/ui/src/features/sessions/sessionServiceHost.ts
index 7aecf3caab..9811a82430 100644
--- a/packages/ui/src/features/sessions/sessionServiceHost.ts
+++ b/packages/ui/src/features/sessions/sessionServiceHost.ts
@@ -58,6 +58,14 @@ export { SessionService };
 
 const log = logger.scope("session-service");
 
+export function shouldEnableSpokenNarration(
+  userOptedIn: boolean,
+  flagEnabled: boolean,
+  isDevelopment: boolean,
+): boolean {
+  return userOptedIn && (flagEnabled || isDevelopment);
+}
+
 function hostClient(): HostTrpcClient {
   return resolveService<HostTrpcClient>(HOST_TRPC_CLIENT);
 }
@@ -122,10 +130,13 @@ function buildSessionServiceDeps(): SessionServiceDeps {
       return {
         ...state,
         customInstructions: getEffectiveCustomInstructions(state),
-        spokenNarrationEnabled:
+        spokenNarrationEnabled: shouldEnableSpokenNarration(
+          state.spokenNotifications,
           resolveService<FeatureFlags>(FEATURE_FLAGS).isEnabled(
             SPOKEN_NARRATION_FLAG,
-          ) || import.meta.env.DEV,
+          ),
+          import.meta.env.DEV,
+        ),
       };
     },
     usageLimit: {
diff --git a/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts b/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
index 1baab22871..10fa554a34 100644
--- a/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
+++ b/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
@@ -15,6 +15,7 @@ import {
   type Adapter,
   ANALYTICS_EVENTS,
   PROJECT_BLUEBIRD_FLAG,
+  SPOKEN_NARRATION_FLAG,
   type TaskCreationInput,
   type WorkspaceMode,
 } from "@posthog/shared";
@@ -219,6 +220,10 @@ export function useTaskCreation({
     PROJECT_BLUEBIRD_FLAG,
     import.meta.env.DEV,
   );
+  const spokenNarrationEnabled = useFeatureFlag(
+    SPOKEN_NARRATION_FLAG,
+    import.meta.env.DEV,
+  );
   const { personalChannel } = useTaskChannels({ enabled: bluebirdEnabled });
 
   const hasRequiredPath = allowNoRepo
@@ -372,6 +377,8 @@ export function useTaskCreation({
           customInstructions: getEffectiveCustomInstructions(settings),
           autoPublishCloudRuns: settings.autoPublishCloudRuns,
           rtkEnabledCloud: settings.rtkEnabledCloud,
+          spokenNarration:
+            settings.spokenNotifications && spokenNarrationEnabled,
           allowNoRepo,
           importedMcpServers: localMcpServersForRun.imported,
           relayedMcpServers: localMcpServersForRun.relayed,
@@ -544,6 +551,7 @@ export function useTaskCreation({
       channelId,
       allowNoRepo,
       bluebirdEnabled,
+      spokenNarrationEnabled,
       personalChannel?.id,
       localMcpServers,
       localMcpServersLoading,

From 7e2010c52a52b733975220bd0d0c9763075e9cc9 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul.dambra@gmail.com>
Date: Thu, 16 Jul 2026 12:50:41 +0100
Subject: [PATCH 8/8] fix(agent): keep narration gating on local sessions

Generated-By: PostHog Code
Task-Id: ac30fada-8c29-4973-a253-08d70be31be6
---
 .../agent/src/adapters/session-meta.test.ts   | 19 +------------------
 packages/agent/src/adapters/session-meta.ts   | 10 ----------
 packages/agent/src/server/agent-server.ts     |  2 --
 .../api-client/src/posthog-client.test.ts     |  2 --
 packages/api-client/src/posthog-client.ts     |  5 -----
 packages/core/src/sessions/sessionService.ts  |  1 -
 .../src/task-detail/taskCreationApiClient.ts  |  1 -
 .../src/task-detail/taskCreationSaga.test.ts  |  2 --
 .../core/src/task-detail/taskCreationSaga.ts  |  1 -
 .../core/src/task-detail/taskInput.test.ts    | 15 ---------------
 packages/core/src/task-detail/taskInput.ts    |  2 --
 packages/shared/src/task-creation-domain.ts   |  2 --
 .../sessions/sessionServiceHost.test.ts       |  1 -
 .../task-detail/hooks/useTaskCreation.ts      |  8 --------
 14 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/packages/agent/src/adapters/session-meta.test.ts b/packages/agent/src/adapters/session-meta.test.ts
index 59617defe7..b3492eece0 100644
--- a/packages/agent/src/adapters/session-meta.test.ts
+++ b/packages/agent/src/adapters/session-meta.test.ts
@@ -1,8 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-  resolveCloudSpokenNarration,
-  resolveSpokenNarration,
-} from "./session-meta";
+import { resolveSpokenNarration } from "./session-meta";
 
 describe("resolveSpokenNarration", () => {
   afterEach(() => {
@@ -51,17 +48,3 @@ describe("resolveSpokenNarration", () => {
     },
   );
 });
-
-describe("resolveCloudSpokenNarration", () => {
-  it.each([
-    { state: { spoken_narration: true }, expected: true },
-    { state: { spoken_narration: false }, expected: false },
-    { state: {}, expected: false },
-    { state: undefined, expected: false },
-  ])(
-    "resolves explicit cloud run opt-in to $expected",
-    ({ state, expected }) => {
-      expect(resolveCloudSpokenNarration(state)).toBe(expected);
-    },
-  );
-});
diff --git a/packages/agent/src/adapters/session-meta.ts b/packages/agent/src/adapters/session-meta.ts
index fe126c37e9..a4ccf9fdde 100644
--- a/packages/agent/src/adapters/session-meta.ts
+++ b/packages/agent/src/adapters/session-meta.ts
@@ -20,10 +20,6 @@ interface SpokenNarrationSource {
   spokenNarration?: boolean;
 }
 
-interface SpokenNarrationRunState {
-  spoken_narration?: unknown;
-}
-
 /**
  * Spoken narration is strictly opt-in: it is on only when a caller explicitly
  * sets `spokenNarration` true at session start. The desktop is the only client
@@ -39,9 +35,3 @@ export function resolveSpokenNarration(
 ): boolean {
   return meta?.spokenNarration === true;
 }
-
-export function resolveCloudSpokenNarration(
-  state: SpokenNarrationRunState | undefined,
-): boolean {
-  return state?.spoken_narration === true;
-}
diff --git a/packages/agent/src/server/agent-server.ts b/packages/agent/src/server/agent-server.ts
index c9fdbb8a50..a8a0b25d4e 100644
--- a/packages/agent/src/server/agent-server.ts
+++ b/packages/agent/src/server/agent-server.ts
@@ -45,7 +45,6 @@ import {
   classifyAgentError,
   isPromptTooLongError,
 } from "../adapters/error-classification";
-import { resolveCloudSpokenNarration } from "../adapters/session-meta";
 import {
   SIGNED_COMMIT_QUALIFIED_TOOL_NAME,
   SIGNED_MERGE_QUALIFIED_TOOL_NAME,
@@ -1498,7 +1497,6 @@ export class AgentServer {
       allowedDomains: this.config.allowedDomains,
       jsonSchema: preTask?.json_schema ?? null,
       permissionMode: initialPermissionMode,
-      spokenNarration: resolveCloudSpokenNarration(runState),
       ...(this.config.baseBranch && { baseBranch: this.config.baseBranch }),
       ...this.buildClaudeCodeSessionMeta(runtimeAdapter),
     };
diff --git a/packages/api-client/src/posthog-client.test.ts b/packages/api-client/src/posthog-client.test.ts
index b8b3981038..8c29ded301 100644
--- a/packages/api-client/src/posthog-client.test.ts
+++ b/packages/api-client/src/posthog-client.test.ts
@@ -25,7 +25,6 @@ describe("PostHogAPIClient", () => {
       adapter: "codex",
       model: "gpt-5.4",
       reasoningLevel: "high",
-      spokenNarration: true,
     });
 
     expect(post).toHaveBeenCalledWith(
@@ -38,7 +37,6 @@ describe("PostHogAPIClient", () => {
           runtime_adapter: "codex",
           model: "gpt-5.4",
           reasoning_effort: "high",
-          spoken_narration: true,
         }),
       }),
     );
diff --git a/packages/api-client/src/posthog-client.ts b/packages/api-client/src/posthog-client.ts
index d99d58f081..7543fb83d4 100644
--- a/packages/api-client/src/posthog-client.ts
+++ b/packages/api-client/src/posthog-client.ts
@@ -613,8 +613,6 @@ interface CloudRunOptions {
   autoPublish?: boolean;
   /** Only false is sent: opts the run out of rtk command-output compression. */
   rtkEnabled?: boolean;
-  /** Explicit desktop opt-in; omitted for headless/background callers. */
-  spokenNarration?: boolean;
   runSource?: CloudRunSource;
   signalReportId?: string;
   initialPermissionMode?: ExecutionMode;
@@ -710,9 +708,6 @@ function buildCloudRunRequestBody(
   if (options?.rtkEnabled === false) {
     body.rtk_enabled = false;
   }
-  if (options?.spokenNarration !== undefined) {
-    body.spoken_narration = options.spokenNarration;
-  }
   if (options?.runSource) {
     body.run_source = options.runSource;
   }
diff --git a/packages/core/src/sessions/sessionService.ts b/packages/core/src/sessions/sessionService.ts
index df868c43b4..096826e4fb 100644
--- a/packages/core/src/sessions/sessionService.ts
+++ b/packages/core/src/sessions/sessionService.ts
@@ -3408,7 +3408,6 @@ export class SessionService {
           prAuthorshipMode,
           autoPublish: previousState.auto_publish === true || undefined,
           rtkEnabled: this.d.settings.rtkEnabledCloud,
-          spokenNarration: this.d.settings.spokenNarrationEnabled === true,
           runSource: getCloudRunSource(previousState),
           signalReportId:
             typeof previousState.signal_report_id === "string"
diff --git a/packages/core/src/task-detail/taskCreationApiClient.ts b/packages/core/src/task-detail/taskCreationApiClient.ts
index 2045ad657f..b09c5f75d2 100644
--- a/packages/core/src/task-detail/taskCreationApiClient.ts
+++ b/packages/core/src/task-detail/taskCreationApiClient.ts
@@ -19,7 +19,6 @@ export interface CreateTaskRunClientOptions {
   prAuthorshipMode?: PrAuthorshipMode;
   autoPublish?: boolean;
   rtkEnabled?: boolean;
-  spokenNarration?: boolean;
   runSource?: CloudRunSource;
   signalReportId?: string;
   initialPermissionMode?: string;
diff --git a/packages/core/src/task-detail/taskCreationSaga.test.ts b/packages/core/src/task-detail/taskCreationSaga.test.ts
index 33d785fd8a..f3d626053a 100644
--- a/packages/core/src/task-detail/taskCreationSaga.test.ts
+++ b/packages/core/src/task-detail/taskCreationSaga.test.ts
@@ -154,7 +154,6 @@ describe("TaskCreationSaga", () => {
       reasoningLevel: "high",
       cloudAutoPublish: true,
       cloudRtkEnabled: false,
-      spokenNarration: true,
     });
 
     expect(result.success).toBe(true);
@@ -173,7 +172,6 @@ describe("TaskCreationSaga", () => {
       prAuthorshipMode: "user",
       autoPublish: true,
       rtkEnabled: false,
-      spokenNarration: true,
       runSource: "manual",
       signalReportId: undefined,
       initialPermissionMode: "auto",
diff --git a/packages/core/src/task-detail/taskCreationSaga.ts b/packages/core/src/task-detail/taskCreationSaga.ts
index 82bd07f724..b3e0c5218a 100644
--- a/packages/core/src/task-detail/taskCreationSaga.ts
+++ b/packages/core/src/task-detail/taskCreationSaga.ts
@@ -404,7 +404,6 @@ export class TaskCreationSaga extends Saga<
             prAuthorshipMode,
             autoPublish: input.cloudAutoPublish,
             rtkEnabled: input.cloudRtkEnabled,
-            spokenNarration: input.spokenNarration,
             runSource: input.cloudRunSource ?? "manual",
             signalReportId: input.signalReportId,
             homeQuickAction: input.homeQuickActionLabel,
diff --git a/packages/core/src/task-detail/taskInput.test.ts b/packages/core/src/task-detail/taskInput.test.ts
index 5d0b6b293d..f45243d608 100644
--- a/packages/core/src/task-detail/taskInput.test.ts
+++ b/packages/core/src/task-detail/taskInput.test.ts
@@ -27,19 +27,4 @@ describe("prepareTaskInput", () => {
     });
     expect(input.customInstructions).toBeUndefined();
   });
-
-  it.each([
-    { workspaceMode: "cloud" as const, expected: true },
-    { workspaceMode: "local" as const, expected: undefined },
-    { workspaceMode: "worktree" as const, expected: undefined },
-  ])(
-    "passes spoken narration through only for cloud (%s)",
-    ({ workspaceMode, expected }) => {
-      const input = prepareTaskInput("do the thing", [], {
-        workspaceMode,
-        spokenNarration: true,
-      });
-      expect(input.spokenNarration).toBe(expected);
-    },
-  );
 });
diff --git a/packages/core/src/task-detail/taskInput.ts b/packages/core/src/task-detail/taskInput.ts
index 66d93f3d57..73bc9550d8 100644
--- a/packages/core/src/task-detail/taskInput.ts
+++ b/packages/core/src/task-detail/taskInput.ts
@@ -32,7 +32,6 @@ export interface PrepareTaskInputOptions {
   customInstructions?: string;
   autoPublishCloudRuns?: boolean;
   rtkEnabledCloud?: boolean;
-  spokenNarration?: boolean;
   allowNoRepo?: boolean;
   importedMcpServers?: CloudMcpServerImport[];
   relayedMcpServers?: CloudMcpServerRelayDesignation[];
@@ -71,7 +70,6 @@ export function prepareTaskInput(
       options.signalReportId && isCloud ? "signal_report" : undefined,
     cloudAutoPublish: isCloud ? options.autoPublishCloudRuns : undefined,
     cloudRtkEnabled: isCloud ? options.rtkEnabledCloud : undefined,
-    spokenNarration: isCloud ? options.spokenNarration : undefined,
     signalReportId: options.signalReportId,
     additionalDirectories: isCloud ? undefined : options.additionalDirectories,
     channelContext: options.channelContext,
diff --git a/packages/shared/src/task-creation-domain.ts b/packages/shared/src/task-creation-domain.ts
index e3fd2a9269..8b073027a9 100644
--- a/packages/shared/src/task-creation-domain.ts
+++ b/packages/shared/src/task-creation-domain.ts
@@ -52,8 +52,6 @@ export interface TaskCreationInput {
    * meaningful: it opts the run out of the server-side default (enabled).
    */
   cloudRtkEnabled?: boolean;
-  /** Explicit desktop opt-in for spoken narration in interactive cloud runs. */
-  spokenNarration?: boolean;
   signalReportId?: string;
   additionalDirectories?: string[];
   /**
diff --git a/packages/ui/src/features/sessions/sessionServiceHost.test.ts b/packages/ui/src/features/sessions/sessionServiceHost.test.ts
index d71fd2f14b..0c84840a5e 100644
--- a/packages/ui/src/features/sessions/sessionServiceHost.test.ts
+++ b/packages/ui/src/features/sessions/sessionServiceHost.test.ts
@@ -5177,7 +5177,6 @@ describe("SessionService", () => {
           model: "gpt-5.4",
           reasoningLevel: "high",
           resumeFromRunId: "run-123",
-          spokenNarration: true,
         }),
       );
     });
diff --git a/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts b/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
index 10fa554a34..1baab22871 100644
--- a/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
+++ b/packages/ui/src/features/task-detail/hooks/useTaskCreation.ts
@@ -15,7 +15,6 @@ import {
   type Adapter,
   ANALYTICS_EVENTS,
   PROJECT_BLUEBIRD_FLAG,
-  SPOKEN_NARRATION_FLAG,
   type TaskCreationInput,
   type WorkspaceMode,
 } from "@posthog/shared";
@@ -220,10 +219,6 @@ export function useTaskCreation({
     PROJECT_BLUEBIRD_FLAG,
     import.meta.env.DEV,
   );
-  const spokenNarrationEnabled = useFeatureFlag(
-    SPOKEN_NARRATION_FLAG,
-    import.meta.env.DEV,
-  );
   const { personalChannel } = useTaskChannels({ enabled: bluebirdEnabled });
 
   const hasRequiredPath = allowNoRepo
@@ -377,8 +372,6 @@ export function useTaskCreation({
           customInstructions: getEffectiveCustomInstructions(settings),
           autoPublishCloudRuns: settings.autoPublishCloudRuns,
           rtkEnabledCloud: settings.rtkEnabledCloud,
-          spokenNarration:
-            settings.spokenNotifications && spokenNarrationEnabled,
           allowNoRepo,
           importedMcpServers: localMcpServersForRun.imported,
           relayedMcpServers: localMcpServersForRun.relayed,
@@ -551,7 +544,6 @@ export function useTaskCreation({
       channelId,
       allowNoRepo,
       bluebirdEnabled,
-      spokenNarrationEnabled,
       personalChannel?.id,
       localMcpServers,
       localMcpServersLoading,