feat(settings): split rtk toggle into local and cloud checkboxes

Replace the single rtkEnabled setting with per-modality checkboxes in one settings row: Local (covers local and worktree sessions, feeds agent start/reconnect) and Cloud (feeds cloud run creation and resume), both default on. The per-session rtkEnabled contract to the workspace-server and the rtk_enabled wire field stay unchanged; only the value sources split. Also move the POSTHOG_RTK env mutation into configureProcessEnv, which owns every other per-session process env write, with test coverage for the pin/delete paths.

Generated-By: PostHog Code
Task-Id: 2d6eed7f-9209-4d1f-be54-ae3e22bf2990

Author: tatoalo

packages/core/src/sessions/sessionService.ts

@@ -300,7 +300,8 @@ export interface SessionServiceDeps {
   };
   readonly settings: {
     customInstructions?: string | null;
-    rtkEnabled?: boolean;
+    rtkEnabledLocal?: boolean;
+    rtkEnabledCloud?: boolean;
   };
   usageLimit: { show: (...args: any[]) => any };
   readonly addDirectoryDialog: { open: boolean };
@@ -1025,12 +1026,12 @@ export class SessionService {
           this.d.log.warn("Failed to verify workspace", { taskId, err });
         });
 
-      const { customInstructions, rtkEnabled } = this.d.settings;
+      const { customInstructions, rtkEnabledLocal } = this.d.settings;
       const result = await this.d.trpc.agent.reconnect.mutate({
         taskId,
         taskRunId,
         repoPath,
-        rtkEnabled,
+        rtkEnabled: rtkEnabledLocal,
         apiHost: auth.apiHost,
         projectId: auth.projectId,
         logUrl,
@@ -1361,7 +1362,7 @@ export class SessionService {
       permissionMode: executionMode,
       adapter,
       customInstructions: startCustomInstructions || undefined,
-      rtkEnabled: this.d.settings.rtkEnabled,
+      rtkEnabled: this.d.settings.rtkEnabledLocal,
       effort: effortLevelSchema.safeParse(reasoningLevel).success
         ? (reasoningLevel as EffortLevel)
         : undefined,
@@ -2999,7 +3000,7 @@ export class SessionService {
             artifactIds.length > 0 ? artifactIds : undefined,
           prAuthorshipMode,
           autoPublish: previousState.auto_publish === true || undefined,
-          rtkEnabled: this.d.settings.rtkEnabled,
+          rtkEnabled: this.d.settings.rtkEnabledCloud,
           runSource: getCloudRunSource(previousState),
           signalReportId:
             typeof previousState.signal_report_id === "string"

packages/core/src/task-detail/taskCreationSaga.test.ts

@@ -153,7 +153,7 @@ describe("TaskCreationSaga", () => {
       model: "gpt-5.4",
       reasoningLevel: "high",
       cloudAutoPublish: true,
-      rtkEnabled: false,
+      cloudRtkEnabled: false,
     });
 
     expect(result.success).toBe(true);

packages/core/src/task-detail/taskCreationSaga.ts

@@ -402,7 +402,7 @@ export class TaskCreationSaga extends Saga<
             sandboxEnvironmentId: input.sandboxEnvironmentId,
             prAuthorshipMode,
             autoPublish: input.cloudAutoPublish,
-            rtkEnabled: input.rtkEnabled,
+            rtkEnabled: input.cloudRtkEnabled,
             runSource: input.cloudRunSource ?? "manual",
             signalReportId: input.signalReportId,
             homeQuickAction: input.homeQuickActionLabel,

packages/core/src/task-detail/taskInput.ts

@@ -28,7 +28,7 @@ export interface PrepareTaskInputOptions {
   channelId?: string;
   customInstructions?: string;
   autoPublishCloudRuns?: boolean;
-  rtkEnabled?: boolean;
+  rtkEnabledCloud?: boolean;
   allowNoRepo?: boolean;
 }
 
@@ -63,7 +63,7 @@ export function prepareTaskInput(
     cloudRunSource:
       options.signalReportId && isCloud ? "signal_report" : undefined,
     cloudAutoPublish: isCloud ? options.autoPublishCloudRuns : undefined,
-    rtkEnabled: options.rtkEnabled,
+    cloudRtkEnabled: isCloud ? options.rtkEnabledCloud : undefined,
     signalReportId: options.signalReportId,
     additionalDirectories: isCloud ? undefined : options.additionalDirectories,
     channelContext: options.channelContext,

packages/shared/src/task-creation-domain.ts

@@ -43,10 +43,10 @@ export interface TaskCreationInput {
    */
   cloudAutoPublish?: boolean;
   /**
-   * rtk command-output compression for the run. Only false is meaningful:
-   * it opts the run out of the server-side default (enabled).
+   * rtk command-output compression for the cloud run. Only false is
+   * meaningful: it opts the run out of the server-side default (enabled).
    */
-  rtkEnabled?: boolean;
+  cloudRtkEnabled?: boolean;
   signalReportId?: string;
   additionalDirectories?: string[];
   /**

packages/ui/src/features/settings/sections/AdvancedSettings.tsx

@@ -11,7 +11,7 @@ import { useSettingsStore } from "@posthog/ui/features/settings/settingsStore";
 import { useSetupStore } from "@posthog/ui/features/setup/setupStore";
 import { useTourStore } from "@posthog/ui/features/tour/tourStore";
 import { clearApplicationStorage } from "@posthog/ui/utils/clearStorage";
-import { Button, Flex, Switch } from "@radix-ui/themes";
+import { Button, Checkbox, Flex, Switch, Text } from "@radix-ui/themes";
 import { useSyncExternalStore } from "react";
 
 export function AdvancedSettings() {
@@ -27,8 +27,10 @@ export function AdvancedSettings() {
   const setAutoPublishCloudRuns = useSettingsStore(
     (s) => s.setAutoPublishCloudRuns,
   );
-  const rtkEnabled = useSettingsStore((s) => s.rtkEnabled);
-  const setRtkEnabled = useSettingsStore((s) => s.setRtkEnabled);
+  const rtkEnabledLocal = useSettingsStore((s) => s.rtkEnabledLocal);
+  const setRtkEnabledLocal = useSettingsStore((s) => s.setRtkEnabledLocal);
+  const rtkEnabledCloud = useSettingsStore((s) => s.rtkEnabledCloud);
+  const setRtkEnabledCloud = useSettingsStore((s) => s.setRtkEnabledCloud);
   const devModeClient = useServiceOptional<DevModeClient>(DEV_MODE_CLIENT);
 
   return (
@@ -45,9 +47,34 @@ export function AdvancedSettings() {
       </SettingRow>
       <SettingRow
         label="Compress command output"
-        description="Route eligible shell commands through rtk so their verbose output is compressed before it reaches the model, reducing token usage. Applies to local, worktree, and cloud runs"
+        description="Route eligible shell commands through rtk so their verbose output is compressed before it reaches the model, reducing token usage. Local covers local and worktree sessions"
       >
-        <Switch checked={rtkEnabled} onCheckedChange={setRtkEnabled} size="1" />
+        <Flex gap="4" align="center">
+          <Text as="label" size="1">
+            <Flex gap="1" align="center">
+              <Checkbox
+                checked={rtkEnabledLocal}
+                onCheckedChange={(checked) =>
+                  setRtkEnabledLocal(checked === true)
+                }
+                size="1"
+              />
+              Local
+            </Flex>
+          </Text>
+          <Text as="label" size="1">
+            <Flex gap="1" align="center">
+              <Checkbox
+                checked={rtkEnabledCloud}
+                onCheckedChange={(checked) =>
+                  setRtkEnabledCloud(checked === true)
+                }
+                size="1"
+              />
+              Cloud
+            </Flex>
+          </Text>
+        </Flex>
       </SettingRow>
       <SettingRow
         label="Reset onboarding and tours"

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

@@ -154,13 +154,16 @@ interface SettingsStore {
   // without waiting for an explicit ask.
   autoPublishCloudRuns: boolean;
   // When on, agent runs compress eligible command output through rtk before it
-  // reaches the model. Applies to local, worktree, and cloud runs.
-  rtkEnabled: boolean;
+  // reaches the model. Split by modality: local covers local and worktree
+  // sessions, cloud covers cloud runs.
+  rtkEnabledLocal: boolean;
+  rtkEnabledCloud: boolean;
   setAllowBypassPermissions: (enabled: boolean) => void;
   setPreventSleepWhileRunning: (enabled: boolean) => void;
   setDebugLogsCloudRuns: (enabled: boolean) => void;
   setAutoPublishCloudRuns: (enabled: boolean) => void;
-  setRtkEnabled: (enabled: boolean) => void;
+  setRtkEnabledLocal: (enabled: boolean) => void;
+  setRtkEnabledCloud: (enabled: boolean) => void;
 
   // Terminal
   terminalFont: TerminalFont;
@@ -328,15 +331,17 @@ export const useSettingsStore = create<SettingsStore>()(
       preventSleepWhileRunning: false,
       debugLogsCloudRuns: false,
       autoPublishCloudRuns: true,
-      rtkEnabled: true,
+      rtkEnabledLocal: true,
+      rtkEnabledCloud: true,
       setAllowBypassPermissions: (enabled) =>
         set({ allowBypassPermissions: enabled }),
       setPreventSleepWhileRunning: (enabled) =>
         set({ preventSleepWhileRunning: enabled }),
       setDebugLogsCloudRuns: (enabled) => set({ debugLogsCloudRuns: enabled }),
       setAutoPublishCloudRuns: (enabled) =>
         set({ autoPublishCloudRuns: enabled }),
-      setRtkEnabled: (enabled) => set({ rtkEnabled: enabled }),
+      setRtkEnabledLocal: (enabled) => set({ rtkEnabledLocal: enabled }),
+      setRtkEnabledCloud: (enabled) => set({ rtkEnabledCloud: enabled }),
 
       // Terminal
       terminalFont: "berkeley-mono",
@@ -450,7 +455,8 @@ export const useSettingsStore = create<SettingsStore>()(
         preventSleepWhileRunning: state.preventSleepWhileRunning,
         debugLogsCloudRuns: state.debugLogsCloudRuns,
         autoPublishCloudRuns: state.autoPublishCloudRuns,
-        rtkEnabled: state.rtkEnabled,
+        rtkEnabledLocal: state.rtkEnabledLocal,
+        rtkEnabledCloud: state.rtkEnabledCloud,
 
         // Terminal
         terminalFont: state.terminalFont,

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

@@ -326,7 +326,7 @@ export function useTaskCreation({
           channelId,
           customInstructions: settings.customInstructions,
           autoPublishCloudRuns: settings.autoPublishCloudRuns,
-          rtkEnabled: settings.rtkEnabled,
+          rtkEnabledCloud: settings.rtkEnabledCloud,
           allowNoRepo,
         });
 

packages/workspace-server/src/services/agent/agent.ts

@@ -765,17 +765,9 @@ If a repository IS genuinely required, attach one in this priority order:
       mockNodeDir,
       proxyUrl,
       claudeCliPath: this.getClaudeCliPath(),
+      rtkEnabled: config.rtkEnabled,
     });
 
-    // The agent auto-detects rtk on PATH; an explicit opt-out from settings
-    // pins it off for sessions this process spawns. Deleting on the enabled
-    // path restores auto-detection after a re-enable without a restart.
-    if (config.rtkEnabled === false) {
-      process.env.POSTHOG_RTK = "0";
-    } else {
-      delete process.env.POSTHOG_RTK;
-    }
-
     const isPreview = taskId === "__preview__";
 
     const agent = new Agent({

packages/workspace-server/src/services/agent/auth-adapter.test.ts

@@ -242,4 +242,27 @@ describe("AgentAuthAdapter", () => {
     expect(process.env.CLAUDE_CODE_EXECUTABLE).toBe("/mock/claude-cli.js");
     expect(process.env.POSTHOG_PROJECT_ID).toBe("1");
   });
+
+  it.each([
+    { rtkEnabled: false, expected: "0" },
+    { rtkEnabled: true, expected: undefined },
+    { rtkEnabled: undefined, expected: undefined },
+  ])(
+    "pins POSTHOG_RTK for rtkEnabled=$rtkEnabled",
+    async ({ rtkEnabled, expected }) => {
+      // A stale value from a previous session must not leak into an
+      // enabled/default session — the enabled path deletes, not skips.
+      process.env.POSTHOG_RTK = "0";
+
+      await adapter.configureProcessEnv({
+        credentials: baseCredentials,
+        mockNodeDir: "/mock/node",
+        proxyUrl: "http://127.0.0.1:9999",
+        claudeCliPath: "/mock/claude-cli.js",
+        rtkEnabled,
+      });
+
+      expect(process.env.POSTHOG_RTK).toBe(expected);
+    },
+  );
 });