fix(web): add default thread env mode setting

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/web/src/appSettings.ts

@@ -21,6 +21,9 @@ const AppSettingsSchema = Schema.Struct({
  codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
  Schema.withConstructorDefault(() => Option.some("")),
  ),
+ defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+ Schema.withConstructorDefault(() => Option.some("local")),
+ ),
  confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
  enableAssistantStreaming: Schema.Boolean.pipe(
  Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
  hasUnseenCompletion,
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
  });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+ it("uses the app default when the caller does not request a specific mode", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("preserves an explicit requested mode over the app default", () => {
+ expect(
+ resolveSidebarNewThreadEnvMode({
+ requestedEnvMode: "local",
+ defaultEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+});
+
 describe("resolveThreadStatusPill", () => {
  const baseThread = {
  interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
  label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
  return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+ requestedEnvMode?: SidebarNewThreadEnvMode;
+ defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+ return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
  isActive: boolean;
  isSelected: boolean;

apps/web/src/components/Sidebar.tsx

@@ -84,6 +84,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 import { isNonEmpty as isNonEmptyString } from "effect/String";
 import {
+ resolveSidebarNewThreadEnvMode,
  resolveThreadRowClassName,
  resolveThreadStatusPill,
  shouldClearThreadSelectionOnMouseDown,
@@ -440,7 +441,9 @@ export default function Sidebar() {
  defaultModel: DEFAULT_MODEL_BY_PROVIDER.codex,
  createdAt,
  });
- await handleNewThread(projectId).catch(() => undefined);
+ await handleNewThread(projectId, {
+ envMode: appSettings.defaultThreadEnvMode,
+ }).catch(() => undefined);
  } catch (error) {
  const description =
  error instanceof Error ? error.message : "An error occurred while adding the project.";
@@ -464,6 +467,7 @@ export default function Sidebar() {
  isAddingProject,
  projects,
  shouldBrowseForProjectImmediately,
+ appSettings.defaultThreadEnvMode,
  ],
  );
 
@@ -1355,7 +1359,11 @@ export default function Sidebar() {
  onClick={(event) => {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(project.id);
+ void handleNewThread(project.id, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  }}
  >
  <SquarePenIcon className="size-3.5" />

apps/web/src/components/ui/switch.tsx

@@ -8,7 +8,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
  return (
  <SwitchPrimitive.Root
  className={cn(
- "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
+ "inline-flex h-[calc(var(--thumb-size)+2px)] w-[calc(var(--thumb-size)*2-2px)] shrink-0 cursor-pointer items-center rounded-full p-px outline-none transition-[background-color,box-shadow] duration-200 [--thumb-size:--spacing(5)] focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-checked:bg-primary data-unchecked:bg-input data-disabled:cursor-not-allowed data-disabled:opacity-64 sm:[--thumb-size:--spacing(4)]",
  className,
  )}
  data-slot="switch"

apps/web/src/routes/_chat.settings.tsx

@@ -502,6 +502,49 @@ function SettingsRouteView() {
  </div>
  </section>
 
+ <section className="rounded-2xl border border-border bg-card p-5">
+ <div className="mb-4">
+ <h2 className="text-sm font-medium text-foreground">Threads</h2>
+ <p className="mt-1 text-xs text-muted-foreground">
+ Choose the default workspace mode for newly created draft threads.
+ </p>
+ </div>
+
+ <div className="flex items-center justify-between rounded-lg border border-border bg-background px-3 py-2">
+ <div>
+ <p className="text-sm font-medium text-foreground">Default to New worktree</p>
+ <p className="text-xs text-muted-foreground">
+ New threads start in New worktree mode instead of Local.
+ </p>
+ </div>
+ <Switch
+ checked={settings.defaultThreadEnvMode === "worktree"}
+ onCheckedChange={(checked) =>
+ updateSettings({
+ defaultThreadEnvMode: checked ? "worktree" : "local",
+ })
+ }
+ aria-label="Default new threads to New worktree mode"
+ />
+ </div>
+
+ {settings.defaultThreadEnvMode !== defaults.defaultThreadEnvMode ? (
+ <div className="mt-3 flex justify-end">
+ <Button
+ size="xs"
+ variant="outline"
+ onClick={() =>
+ updateSettings({
+ defaultThreadEnvMode: defaults.defaultThreadEnvMode,
+ })
+ }
+ >
+ Restore default
+ </Button>
+ </div>
+ ) : null}
+ </section>
+
  <section className="rounded-2xl border border-border bg-card p-5">
  <div className="mb-4">
  <h2 className="text-sm font-medium text-foreground">Responses</h2>

apps/web/src/routes/_chat.tsx

@@ -12,6 +12,8 @@ import { resolveShortcutCommand } from "../keybindings";
 import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { Sidebar, SidebarProvider } from "~/components/ui/sidebar";
+import { resolveSidebarNewThreadEnvMode } from "~/components/Sidebar.logic";
+import { useAppSettings } from "~/appSettings";
 
 const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
 
@@ -27,6 +29,7 @@ function ChatRouteGlobalShortcuts() {
  ? selectThreadTerminalState(state.terminalStateByThreadId, routeThreadId).terminalOpen
  : false,
  );
+ const { settings: appSettings } = useAppSettings();
 
  useEffect(() => {
  const onWindowKeyDown = (event: KeyboardEvent) => {
@@ -51,7 +54,11 @@ function ChatRouteGlobalShortcuts() {
  if (command === "chat.newLocal") {
  event.preventDefault();
  event.stopPropagation();
- void handleNewThread(projectId);
+ void handleNewThread(projectId, {
+ envMode: resolveSidebarNewThreadEnvMode({
+ defaultEnvMode: appSettings.defaultThreadEnvMode,
+ }),
+ });
  return;
  }
 
@@ -78,6 +85,7 @@ function ChatRouteGlobalShortcuts() {
  projects,
  selectedThreadIdsSize,
  terminalOpen,
+ appSettings.defaultThreadEnvMode,
  ]);
 
  return null;