Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Add origin-based worktree bootstrap option (#3157)
Julius Marminge52a24c890265
diff --git a/apps/server/src/git/GitWorkflowService.ts b/apps/server/src/git/GitWorkflowService.tsindex 5fce28922..0af4847f4 100644--- a/apps/server/src/git/GitWorkflowService.ts+++ b/apps/server/src/git/GitWorkflowService.ts@@ -61,6 +61,18 @@ export interface GitWorkflowServiceShape {readonly createWorktree: (input: VcsCreateWorktreeInput,) => Effect.Effect<VcsCreateWorktreeResult, GitCommandError>;+ readonly fetchRemote: (input: {+ readonly cwd: string;+ readonly remoteName: string;+ }) => Effect.Effect<void, GitCommandError>;+ readonly resolveRemoteTrackingCommit: (input: {+ readonly cwd: string;+ readonly refName: string;+ readonly fallbackRemoteName: string;+ }) => Effect.Effect<+ { readonly commitSha: string; readonly remoteRefName: string },+ GitCommandError+ >;readonly removeWorktree: (input: VcsRemoveWorktreeInput) => Effect.Effect<void, GitCommandError>;readonly createRef: (input: VcsCreateRefInput,@@ -295,6 +307,14 @@ export const make = Effect.fn("makeGitWorkflowService")(function* () {ensureGitCommand("GitWorkflowService.createWorktree", input.cwd).pipe(Effect.andThen(git.createWorktree(input)),),+ fetchRemote: (input) =>+ ensureGitCommand("GitWorkflowService.fetchRemote", input.cwd).pipe(+ Effect.andThen(git.fetchRemote(input)),+ ),+ resolveRemoteTrackingCommit: (input) =>+ ensureGitCommand("GitWorkflowService.resolveRemoteTrackingCommit", input.cwd).pipe(+ Effect.andThen(git.resolveRemoteTrackingCommit(input)),+ ),removeWorktree: (input) =>ensureGitCommand("GitWorkflowService.removeWorktree", input.cwd).pipe(Effect.andThen(git.removeWorktree(input)),diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.tsindex 77a4dbde2..205833289 100644--- a/apps/server/src/server.test.ts+++ b/apps/server/src/server.test.ts@@ -5918,6 +5918,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {() =>Effect.gen(function* () {const dispatchedCommands: Array<OrchestrationCommand> = [];+ const bootstrapGitOperations: string[] = [];const refreshStatus = vi.fn((_: string) =>Effect.succeed({isRepo: true,@@ -5936,13 +5937,33 @@ it.layer(NodeServices.layer)("server router seam", (it) => {pr: null,}),);+ const fetchRemote = vi.fn(+ (_: Parameters<GitVcsDriver.GitVcsDriverShape["fetchRemote"]>[0]) =>+ Effect.sync(() => {+ bootstrapGitOperations.push("fetch");+ }),+ );+ const fetchedOriginCommit = "0123456789abcdef0123456789abcdef01234567";+ const resolveRemoteTrackingCommit = vi.fn(+ (_: Parameters<GitVcsDriver.GitVcsDriverShape["resolveRemoteTrackingCommit"]>[0]) =>+ Effect.sync(() => {+ bootstrapGitOperations.push("resolve-remote-commit");+ return {+ commitSha: fetchedOriginCommit,+ remoteRefName: "origin/main",+ };+ }),+ );const createWorktree = vi.fn((_: Parameters<GitVcsDriver.GitVcsDriverShape["createWorktree"]>[0]) =>- Effect.succeed({- worktree: {- refName: "t3code/bootstrap-refName",- path: "/tmp/bootstrap-worktree",- },+ Effect.sync(() => {+ bootstrapGitOperations.push("create-worktree");+ return {+ worktree: {+ refName: "t3code/bootstrap-refName",+ path: "/tmp/bootstrap-worktree",+ },+ };}),);const runForThread = vi.fn(@@ -5959,6 +5980,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {yield* buildAppUnderTest({layers: {gitVcsDriver: {+ fetchRemote,+ resolveRemoteTrackingCommit,createWorktree,},vcsStatusBroadcaster: {@@ -6010,6 +6033,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {projectCwd: "/tmp/project",baseBranch: "main",branch: "t3code/bootstrap-refName",+ startFromOrigin: true,},runSetupScript: true,},@@ -6031,10 +6055,24 @@ it.layer(NodeServices.layer)("server router seam", (it) => {);assert.deepEqual(createWorktree.mock.calls[0]?.[0], {cwd: "/tmp/project",- refName: "main",+ refName: fetchedOriginCommit,newRefName: "t3code/bootstrap-refName",path: null,});+ assert.deepEqual(fetchRemote.mock.calls[0]?.[0], {+ cwd: "/tmp/project",+ remoteName: "origin",+ });+ assert.deepEqual(resolveRemoteTrackingCommit.mock.calls[0]?.[0], {+ cwd: "/tmp/project",+ refName: "main",+ fallbackRemoteName: "origin",+ });+ assert.deepEqual(bootstrapGitOperations, [+ "fetch",+ "resolve-remote-commit",+ "create-worktree",+ ]);assert.deepEqual(runForThread.mock.calls[0]?.[0], {threadId: ThreadId.make("thread-bootstrap"),projectId: defaultProjectId,diff --git a/apps/server/src/vcs/GitVcsDriver.ts b/apps/server/src/vcs/GitVcsDriver.tsindex 66a5157ae..ff0d64490 100644--- a/apps/server/src/vcs/GitVcsDriver.ts+++ b/apps/server/src/vcs/GitVcsDriver.ts@@ -161,6 +161,22 @@ export interface GitFetchRemoteTrackingBranchInput {remoteBranch: string;}+export interface GitFetchRemoteInput {+ cwd: string;+ remoteName: string;+}++export interface GitResolveRemoteTrackingCommitInput {+ cwd: string;+ refName: string;+ fallbackRemoteName: string;+}++export interface GitResolveRemoteTrackingCommitResult {+ commitSha: string;+ remoteRefName: string;+}+export interface GitSetBranchUpstreamInput {cwd: string;branch: string;@@ -217,6 +233,10 @@ export interface GitVcsDriverShape {) => Effect.Effect<void, GitCommandError>;readonly ensureRemote: (input: GitEnsureRemoteInput) => Effect.Effect<string, GitCommandError>;readonly resolvePrimaryRemoteName: (cwd: string) => Effect.Effect<string, GitCommandError>;+ readonly fetchRemote: (input: GitFetchRemoteInput) => Effect.Effect<void, GitCommandError>;+ readonly resolveRemoteTrackingCommit: (+ input: GitResolveRemoteTrackingCommitInput,+ ) => Effect.Effect<GitResolveRemoteTrackingCommitResult, GitCommandError>;readonly fetchRemoteBranch: (input: GitFetchRemoteBranchInput,) => Effect.Effect<void, GitCommandError>;diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.tsindex f4b2fe4d9..41f5d595f 100644--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts@@ -442,6 +442,69 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {});describe("remote operations", () => {+ it.effect("creates a worktree from the latest fetched remote commit", () =>+ Effect.gen(function* () {+ const cwd = yield* makeTmpDir();+ const remote = yield* makeTmpDir("git-remote-");+ const peer = yield* makeTmpDir("git-peer-");+ const { initialBranch } = yield* initRepoWithCommit(cwd);+ yield* git(remote, ["init", "--bare"]);+ yield* git(cwd, ["remote", "add", "origin", remote]);+ yield* git(cwd, ["push", "-u", "origin", initialBranch]);+ yield* git(remote, ["symbolic-ref", "HEAD", `refs/heads/${initialBranch}`]);+ const beforeFetch = yield* git(cwd, ["rev-parse", `refs/remotes/origin/${initialBranch}`]);++ yield* git(peer, ["clone", remote, "."]);+ yield* git(peer, ["config", "user.email", "[email protected]"]);+ yield* git(peer, ["config", "user.name", "Test"]);+ yield* writeTextFile(peer, "remote-change.txt", "remote\n");+ yield* git(peer, ["add", "remote-change.txt"]);+ yield* git(peer, ["commit", "-m", "remote change"]);+ yield* git(peer, ["push", "origin", initialBranch]);+ const remoteHead = yield* git(peer, ["rev-parse", "HEAD"]);+ assert.notEqual(beforeFetch, remoteHead);++ const driver = yield* GitVcsDriver.GitVcsDriver;+ yield* driver.fetchRemote({ cwd, remoteName: "origin" });++ const resolvedBase = yield* driver.resolveRemoteTrackingCommit({+ cwd,+ refName: initialBranch,+ fallbackRemoteName: "origin",+ });+ const explicitlyResolvedBase = yield* driver.resolveRemoteTrackingCommit({+ cwd,+ refName: `origin/${initialBranch}`,+ fallbackRemoteName: "origin",+ });++ assert.deepEqual(resolvedBase, {+ commitSha: remoteHead,+ remoteRefName: `origin/${initialBranch}`,+ });+ assert.deepEqual(explicitlyResolvedBase, resolvedBase);+ assert.equal(yield* git(cwd, ["rev-parse", initialBranch]), beforeFetch);++ const pathService = yield* Path.Path;+ const worktreePath = pathService.join(+ yield* makeTmpDir("git-fetched-worktrees-"),+ "fetched-origin",+ );+ yield* driver.createWorktree({+ cwd,+ path: worktreePath,+ refName: resolvedBase.commitSha,+ newRefName: "t3code/fetched-origin",+ });++ assert.equal(yield* git(worktreePath, ["rev-parse", "HEAD"]), remoteHead);+ assert.equal(+ yield* driver.readConfigValue(worktreePath, "branch.t3code/fetched-origin.remote"),+ null,+ );+ }),+ );+it.effect("pushes with upstream setup and skips when already up to date", () =>Effect.gen(function* () {const cwd = yield* makeTmpDir();diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.tsindex 69550e0e7..5c2407205 100644--- a/apps/server/src/vcs/GitVcsDriverCore.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.ts@@ -2188,6 +2188,38 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*);});+ const fetchRemote: GitVcsDriver.GitVcsDriverShape["fetchRemote"] = Effect.fn("fetchRemote")(+ function* (input) {+ yield* executeGit(+ "GitVcsDriver.fetchRemote",+ input.cwd,+ ["fetch", "--quiet", input.remoteName],+ {+ env: STATUS_UPSTREAM_REFRESH_ENV,+ fallbackErrorMessage: `git fetch ${input.remoteName} failed`,+ },+ );+ },+ );++ const resolveRemoteTrackingCommit: GitVcsDriver.GitVcsDriverShape["resolveRemoteTrackingCommit"] =+ Effect.fn("resolveRemoteTrackingCommit")(function* (input) {+ const remoteNames = yield* listRemoteNames(input.cwd);+ const parsedRemoteRef = parseRemoteRefWithRemoteNames(+ input.refName,+ remoteNames.toSorted((left, right) => right.length - left.length),+ );+ const remoteRefName =+ parsedRemoteRef?.remoteRef ?? `${input.fallbackRemoteName}/${input.refName}`;+ const commitSha = yield* runGitStdout("GitVcsDriver.resolveRemoteTrackingCommit", input.cwd, [+ "rev-parse",+ "--verify",+ `refs/remotes/${remoteRefName}^{commit}`,+ ]).pipe(Effect.map((stdout) => stdout.trim()));++ return { commitSha, remoteRefName };+ });+const fetchRemoteBranch: GitVcsDriver.GitVcsDriverShape["fetchRemoteBranch"] = Effect.fn("fetchRemoteBranch",)(function* (input) {@@ -2413,6 +2445,8 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*fetchPullRequestBranch,ensureRemote,resolvePrimaryRemoteName,+ fetchRemote,+ resolveRemoteTrackingCommit,fetchRemoteBranch,fetchRemoteTrackingBranch,setBranchUpstream,diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.tsindex 34c993de8..1ad37e7c4 100644--- a/apps/server/src/ws.ts+++ b/apps/server/src/ws.ts@@ -694,9 +694,22 @@ const makeWsRpcLayer = (currentSession: AuthenticatedSession) =>}if (bootstrap?.prepareWorktree) {+ let worktreeBaseRef = bootstrap.prepareWorktree.baseBranch;+ if (bootstrap.prepareWorktree.startFromOrigin) {+ yield* gitWorkflow.fetchRemote({+ cwd: bootstrap.prepareWorktree.projectCwd,+ remoteName: "origin",+ });+ const resolvedRemoteBase = yield* gitWorkflow.resolveRemoteTrackingCommit({+ cwd: bootstrap.prepareWorktree.projectCwd,+ refName: bootstrap.prepareWorktree.baseBranch,+ fallbackRemoteName: "origin",+ });+ worktreeBaseRef = resolvedRemoteBase.commitSha;+ }const worktree = yield* gitWorkflow.createWorktree({cwd: bootstrap.prepareWorktree.projectCwd,- refName: bootstrap.prepareWorktree.baseBranch,+ refName: worktreeBaseRef,newRefName: bootstrap.prepareWorktree.branch,path: null,});diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsxindex d9b0989b6..03f24dac8 100644--- a/apps/web/src/components/BranchToolbar.tsx+++ b/apps/web/src/components/BranchToolbar.tsx@@ -45,6 +45,8 @@ interface BranchToolbarProps {effectiveEnvModeOverride?: EnvMode;activeThreadBranchOverride?: string | null;onActiveThreadBranchOverrideChange?: (branch: string | null) => void;+ startFromOrigin: boolean;+ onStartFromOriginChange: (startFromOrigin: boolean) => void;envLocked: boolean;onCheckoutPullRequestRequest?: (reference: string) => void;onComposerFocusRequest?: () => void;@@ -196,6 +198,8 @@ export const BranchToolbar = memo(function BranchToolbar({effectiveEnvModeOverride,activeThreadBranchOverride,onActiveThreadBranchOverrideChange,+ startFromOrigin,+ onStartFromOriginChange,envLocked,onCheckoutPullRequestRequest,onComposerFocusRequest,@@ -279,6 +283,8 @@ export const BranchToolbar = memo(function BranchToolbar({{...(effectiveEnvModeOverride ? { effectiveEnvModeOverride } : {})}{...(activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : {})}{...(onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : {})}+ startFromOrigin={startFromOrigin}+ onStartFromOriginChange={onStartFromOriginChange}{...(onCheckoutPullRequestRequest ? { onCheckoutPullRequestRequest } : {})}{...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}/>diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsxindex fd2c2b8c2..f8a2e1a6f 100644--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -5,11 +5,12 @@ import {} from "@t3tools/client-runtime/state/runtime";import type { EnvironmentId, VcsRef, ThreadId } from "@t3tools/contracts";import { LegendList, type LegendListRef } from "@legendapp/list/react";-import { ChevronDownIcon, GitBranchIcon, SearchIcon } from "lucide-react";+import { ChevronDownIcon, GitBranchIcon, RefreshCwIcon, SearchIcon } from "lucide-react";import {useCallback,useDeferredValue,useEffect,+ useId,useLayoutEffect,useMemo,useOptimistic,@@ -37,6 +38,8 @@ import {shouldIncludeBranchPickerItem,} from "./BranchToolbar.logic";import { Button } from "./ui/button";+import { Switch } from "./ui/switch";+import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";import {Combobox,ComboboxEmpty,@@ -58,6 +61,8 @@ interface BranchToolbarBranchSelectorProps {effectiveEnvModeOverride?: "local" | "worktree";activeThreadBranchOverride?: string | null;onActiveThreadBranchOverrideChange?: (refName: string | null) => void;+ startFromOrigin: boolean;+ onStartFromOriginChange: (startFromOrigin: boolean) => void;onCheckoutPullRequestRequest?: (reference: string) => void;onComposerFocusRequest?: () => void;}@@ -90,9 +95,12 @@ export function BranchToolbarBranchSelector({effectiveEnvModeOverride,activeThreadBranchOverride,onActiveThreadBranchOverrideChange,+ startFromOrigin,+ onStartFromOriginChange,onCheckoutPullRequestRequest,onComposerFocusRequest,}: BranchToolbarBranchSelectorProps) {+ const startFromOriginSwitchId = useId();const stopThreadSession = useAtomCommand(threadEnvironment.stopSession, "thread session stop");const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata,@@ -674,6 +682,34 @@ export function BranchToolbarBranchSelector({/></ComboboxListVirtualized></div>+ {isSelectingWorktreeBase ? (+ <Tooltip>+ <TooltipTrigger+ render={+ <label+ htmlFor={startFromOriginSwitchId}+ className="flex cursor-pointer items-center justify-between gap-3 border-t border-border/60 px-3 py-2 text-xs"+ >+ <span className="flex min-w-0 items-center gap-1.5 font-medium text-muted-foreground">+ <RefreshCwIcon aria-hidden="true" className="size-3 shrink-0 opacity-70" />+ <span className="truncate">Start from origin</span>+ </span>+ <Switch+ id={startFromOriginSwitchId}+ checked={startFromOrigin}+ className="[--thumb-size:--spacing(3.5)]"+ aria-label="Start worktree from origin"+ onCheckedChange={(checked) => onStartFromOriginChange(Boolean(checked))}+ />+ </label>+ }+ />+ <TooltipPopup side="top" className="max-w-72 whitespace-normal leading-tight">+ Creates the worktree from the latest matching branch on origin instead of your local+ branch.+ </TooltipPopup>+ </Tooltip>+ ) : null}{branchStatusText ? <ComboboxStatus>{branchStatusText}</ComboboxStatus> : null}</div></ComboboxPopup>diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex ea63b96f6..a1ef90c43 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -141,6 +141,7 @@ import { getProviderModelCapabilities, resolveSelectableProvider } from "../provimport { useSettings } from "../hooks/useSettings";import { resolveAppModelSelectionForInstance } from "../modelSelection";import { getTerminalFocusOwner } from "../lib/terminalFocus";+import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";import {deriveLogicalProjectKeyFromSettings,selectProjectGroupingSettings,@@ -1129,6 +1130,10 @@ function ChatViewContent(props: ChatViewProps) {const [pendingServerThreadEnvMode, setPendingServerThreadEnvMode] =useState<DraftThreadEnvMode | null>(null);const [pendingServerThreadBranch, setPendingServerThreadBranch] = useState<string | null>();+ const [+ pendingServerThreadStartFromOriginByThreadId,+ setPendingServerThreadStartFromOriginByThreadId,+ ] = useState<Record<string, boolean>>({});const [lastInvokedScriptByProjectId, setLastInvokedScriptByProjectId] = useLocalStorage(LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,{},@@ -3330,6 +3335,12 @@ function ChatViewContent(props: ChatViewProps) {canOverrideServerThreadEnvMode && pendingServerThreadBranch !== undefined? pendingServerThreadBranch: (activeThread?.branch ?? null);+ const startFromOrigin = isLocalDraftThread+ ? (draftThread?.startFromOrigin ?? false)+ : canOverrideServerThreadEnvMode+ ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??+ settings.newWorktreesStartFromOrigin)+ : false;const sendEnvMode = resolveSendEnvMode({requestedEnvMode: envMode,isGitRepo,@@ -3892,6 +3903,7 @@ function ChatViewContent(props: ChatViewProps) {projectCwd: activeProject.workspaceRoot,baseBranch: baseBranchForWorktree,branch: buildTemporaryWorktreeBranchName(randomHex),+ ...(startFromOrigin ? { startFromOrigin: true } : {}),},runSetupScript: true,}@@ -4577,6 +4589,10 @@ function ChatViewContent(props: ChatViewProps) {if (isLocalDraftThread) {setDraftThreadContext(composerDraftTarget, {envMode: mode,+ startFromOrigin: resolveNewDraftStartFromOrigin({+ envMode: mode,+ newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,+ }),...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),});}@@ -4587,12 +4603,29 @@ function ChatViewContent(props: ChatViewProps) {composerDraftTarget,draftThread?.worktreePath,isLocalDraftThread,+ settings.newWorktreesStartFromOrigin,setPendingServerThreadEnvMode,scheduleComposerFocus,setDraftThreadContext,],);+ const onStartFromOriginChange = (nextStartFromOrigin: boolean) => {+ if (canOverrideServerThreadEnvMode && activeThread) {+ setPendingServerThreadStartFromOriginByThreadId((current) =>+ current[activeThread.id] === nextStartFromOrigin+ ? current+ : { ...current, [activeThread.id]: nextStartFromOrigin },+ );+ return;+ }+ if (isLocalDraftThread) {+ setDraftThreadContext(composerDraftTarget, {+ startFromOrigin: nextStartFromOrigin,+ });+ }+ };+const onExpandTimelineImage = useCallback((preview: ExpandedImagePreview) => {setExpandedImage(preview);}, []);@@ -4926,6 +4959,8 @@ function ChatViewContent(props: ChatViewProps) {threadId={activeThread.id}{...(routeKind === "draft" && draftId ? { draftId } : {})}onEnvModeChange={onEnvModeChange}+ startFromOrigin={startFromOrigin}+ onStartFromOriginChange={onStartFromOriginChange}{...(canOverrideServerThreadEnvMode ? { effectiveEnvModeOverride: envMode } : {})}{...(canOverrideServerThreadEnvMode? {diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.tsindex 61fae76f8..b1c29888f 100644--- a/apps/web/src/components/Sidebar.logic.test.ts+++ b/apps/web/src/components/Sidebar.logic.test.ts@@ -237,6 +237,7 @@ describe("resolveSidebarNewThreadSeedContext", () => {branch: "feature/draft",worktreePath: "/repo/.t3/worktrees/draft",envMode: "worktree",+ startFromOrigin: true,},}),).toEqual({@@ -278,12 +279,14 @@ describe("resolveSidebarNewThreadSeedContext", () => {branch: "feature/new-draft",worktreePath: "/repo/worktree",envMode: "worktree",+ startFromOrigin: true,},}),).toEqual({branch: "feature/new-draft",worktreePath: "/repo/worktree",envMode: "worktree",+ startFromOrigin: true,});});diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsindex 0ca86ae8f..f628e21e4 100644--- a/apps/web/src/components/Sidebar.logic.ts+++ b/apps/web/src/components/Sidebar.logic.ts@@ -189,11 +189,13 @@ export function resolveSidebarNewThreadSeedContext(input: {branch: string | null;worktreePath: string | null;envMode: SidebarNewThreadEnvMode;+ startFromOrigin: boolean;} | null;}): {branch?: string | null;worktreePath?: string | null;envMode: SidebarNewThreadEnvMode;+ startFromOrigin?: boolean;} {if (input.defaultEnvMode === "worktree") {return {@@ -206,6 +208,7 @@ export function resolveSidebarNewThreadSeedContext(input: {branch: input.activeDraftThread.branch,worktreePath: input.activeDraftThread.worktreePath,envMode: input.activeDraftThread.envMode,+ startFromOrigin: input.activeDraftThread.startFromOrigin,};}diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex b943fb5a6..1b46b0f1d 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -1875,6 +1875,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjecbranch: currentActiveDraftThread.branch,worktreePath: currentActiveDraftThread.worktreePath,envMode: currentActiveDraftThread.envMode,+ startFromOrigin: currentActiveDraftThread.startFromOrigin,}: null,});@@ -1889,6 +1890,9 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec? { worktreePath: seedContext.worktreePath }: {}),envMode: seedContext.envMode,+ ...(seedContext.startFromOrigin !== undefined+ ? { startFromOrigin: seedContext.startFromOrigin }+ : {}),}),);if (result._tag === "Failure") {diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsxindex f478eac7d..71311c10d 100644--- a/apps/web/src/components/settings/SettingsPanels.tsx+++ b/apps/web/src/components/settings/SettingsPanels.tsx@@ -408,6 +408,10 @@ export function useSettingsRestore(onRestored?: () => void) {...(settings.defaultThreadEnvMode !== DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode? ["New thread mode"]: []),+ ...(settings.newWorktreesStartFromOrigin !==+ DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin+ ? ["New worktrees start from origin"]+ : []),...(settings.addProjectBaseDirectory !== DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory? ["Add project base directory"]: []),@@ -426,6 +430,7 @@ export function useSettingsRestore(onRestored?: () => void) {settings.confirmThreadDelete,settings.addProjectBaseDirectory,settings.defaultThreadEnvMode,+ settings.newWorktreesStartFromOrigin,settings.diffIgnoreWhitespace,settings.diffWordWrap,settings.automaticGitFetchInterval,@@ -456,6 +461,7 @@ export function useSettingsRestore(onRestored?: () => void) {enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,automaticGitFetchInterval: DEFAULT_UNIFIED_SETTINGS.automaticGitFetchInterval,defaultThreadEnvMode: DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode,+ newWorktreesStartFromOrigin: DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin,addProjectBaseDirectory: DEFAULT_UNIFIED_SETTINGS.addProjectBaseDirectory,confirmThreadArchive: DEFAULT_UNIFIED_SETTINGS.confirmThreadArchive,confirmThreadDelete: DEFAULT_UNIFIED_SETTINGS.confirmThreadDelete,@@ -692,12 +698,16 @@ export function GeneralSettingsPanel() {title="New threads"description="Pick the default workspace mode for newly created draft threads."resetAction={- settings.defaultThreadEnvMode !== DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode ? (+ settings.defaultThreadEnvMode !== DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode ||+ settings.newWorktreesStartFromOrigin !==+ DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin ? (<SettingResetButtonlabel="new threads"onClick={() =>updateSettings({defaultThreadEnvMode: DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode,+ newWorktreesStartFromOrigin:+ DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin,})}/>@@ -729,6 +739,37 @@ export function GeneralSettingsPanel() {}/>+ {settings.defaultThreadEnvMode === "worktree" ? (+ <SettingsRow+ className="bg-muted/20 sm:pl-9"+ title="Start from origin"+ description="Creates the worktree from the latest matching branch on origin instead of your local branch."+ resetAction={+ settings.newWorktreesStartFromOrigin !==+ DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin ? (+ <SettingResetButton+ label="new worktrees start from origin"+ onClick={() =>+ updateSettings({+ newWorktreesStartFromOrigin:+ DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin,+ })+ }+ />+ ) : null+ }+ control={+ <Switch+ checked={settings.newWorktreesStartFromOrigin}+ onCheckedChange={(checked) =>+ updateSettings({ newWorktreesStartFromOrigin: Boolean(checked) })+ }+ aria-label="Start new worktrees from origin by default"+ />+ }+ />+ ) : null}+<SettingsRowtitle="Add project starts in"description='Leave empty to use "~/" when the Add Project browser opens.'diff --git a/apps/web/src/composerDraftStore.test.ts b/apps/web/src/composerDraftStore.test.tsindex 1ab8d05ac..bc1b71073 100644--- a/apps/web/src/composerDraftStore.test.ts+++ b/apps/web/src/composerDraftStore.test.ts@@ -1035,6 +1035,21 @@ describe("composerDraftStore project draft thread mapping", () => {});});+ it("stores the start-from-origin choice with the draft thread", () => {+ const store = useComposerDraftStore.getState();+ store.setProjectDraftThreadId(projectRef, draftId, {+ threadId,+ envMode: "worktree",+ startFromOrigin: true,+ });++ expect(useComposerDraftStore.getState().getDraftThread(draftId)?.startFromOrigin).toBe(true);++ store.setDraftThreadContext(draftId, { startFromOrigin: false });++ expect(useComposerDraftStore.getState().getDraftThread(draftId)?.startFromOrigin).toBe(false);+ });+it("preserves existing branch and worktree when setProjectDraftThreadId receives undefined", () => {const store = useComposerDraftStore.getState();store.setProjectDraftThreadId(projectRef, draftId, {diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.tsindex b92595227..fdb8bfe7b 100644--- a/apps/web/src/composerDraftStore.ts+++ b/apps/web/src/composerDraftStore.ts@@ -27,6 +27,7 @@ import {} from "@t3tools/client-runtime/environment";import * as Schema from "effect/Schema";import * as Equal from "effect/Equal";+import * as Effect from "effect/Effect";import { DeepMutable } from "effect/Types";import { createModelSelection, normalizeModelSlug } from "@t3tools/shared/model";import { useMemo } from "react";@@ -214,6 +215,7 @@ const PersistedDraftThreadState = Schema.Struct({branch: Schema.NullOr(Schema.String),worktreePath: Schema.NullOr(Schema.String),envMode: DraftThreadEnvModeSchema,+ startFromOrigin: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),promotedTo: Schema.optionalKey(Schema.NullOr(Schema.Struct({@@ -292,6 +294,7 @@ export interface DraftSessionState {branch: string | null;worktreePath: string | null;envMode: DraftThreadEnvMode;+ startFromOrigin: boolean;promotedTo?: ScopedThreadRef | null;}@@ -353,6 +356,7 @@ interface ComposerDraftStoreState {worktreePath?: string | null;createdAt?: string;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;runtimeMode?: RuntimeMode;interactionMode?: ProviderInteractionMode;},@@ -367,6 +371,7 @@ interface ComposerDraftStoreState {worktreePath?: string | null;createdAt?: string;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;runtimeMode?: RuntimeMode;interactionMode?: ProviderInteractionMode;},@@ -380,6 +385,7 @@ interface ComposerDraftStoreState {projectRef?: ScopedProjectRef;createdAt?: string;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;runtimeMode?: RuntimeMode;interactionMode?: ProviderInteractionMode;},@@ -1313,6 +1319,7 @@ function createDraftThreadState(worktreePath?: string | null;createdAt?: string;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;runtimeMode?: RuntimeMode;interactionMode?: ProviderInteractionMode;},@@ -1333,6 +1340,12 @@ function createDraftThreadState(? null: (existingThread?.branch ?? null): (options.branch ?? null);+ const nextStartFromOrigin =+ options?.startFromOrigin === undefined+ ? projectChanged+ ? false+ : (existingThread?.startFromOrigin ?? false)+ : options.startFromOrigin;return {threadId,environmentId: projectRef.environmentId,@@ -1351,6 +1364,7 @@ function createDraftThreadState(: projectChanged? "local": (existingThread?.envMode ?? "local")),+ startFromOrigin: nextStartFromOrigin,promotedTo: null,};}@@ -1382,6 +1396,7 @@ function draftThreadsEqual(left: DraftThreadState | undefined, right: DraftThrealeft.branch === right.branch &&left.worktreePath === right.worktreePath &&left.envMode === right.envMode &&+ left.startFromOrigin === right.startFromOrigin &&scopedThreadRefsEqual(left.promotedTo, right.promotedTo));}@@ -1476,6 +1491,7 @@ function normalizePersistedDraftThreads(const createdAt = candidateDraftThread.createdAt;const branch = candidateDraftThread.branch;const worktreePath = candidateDraftThread.worktreePath;+ const startFromOrigin = candidateDraftThread.startFromOrigin === true;const normalizedWorktreePath = typeof worktreePath === "string" ? worktreePath : null;const promotedToCandidate = candidateDraftThread.promotedTo;const promotedToRecord =@@ -1523,6 +1539,7 @@ function normalizePersistedDraftThreads(branch: typeof branch === "string" ? branch : null,worktreePath: normalizedWorktreePath,envMode: normalizeDraftThreadEnvMode(candidateDraftThread.envMode, normalizedWorktreePath),+ startFromOrigin,promotedTo,};}@@ -1568,6 +1585,7 @@ function normalizePersistedDraftThreads(branch: null,worktreePath: null,envMode: "local",+ startFromOrigin: false,promotedTo: null,};} else if (@@ -2138,6 +2156,7 @@ function toHydratedDraftThreadState(branch: persistedDraftThread.branch,worktreePath: persistedDraftThread.worktreePath,envMode: persistedDraftThread.envMode,+ startFromOrigin: persistedDraftThread.startFromOrigin,promotedTo: persistedDraftThread.promotedTo? scopeThreadRef(persistedDraftThread.promotedTo.environmentId as EnvironmentId,@@ -2323,6 +2342,12 @@ const composerDraftStore = create<ComposerDraftStoreState>()(? null: existing.branch: (options.branch ?? null);+ const nextStartFromOrigin =+ options.startFromOrigin === undefined+ ? projectChanged+ ? false+ : existing.startFromOrigin+ : options.startFromOrigin;const nextDraftThread: DraftThreadState = {threadId: existing.threadId,environmentId: nextProjectRef.environmentId,@@ -2343,6 +2368,7 @@ const composerDraftStore = create<ComposerDraftStoreState>()(: projectChanged? "local": (existing.envMode ?? "local")),+ startFromOrigin: nextStartFromOrigin,promotedTo: existing.promotedTo ?? null,};const isUnchanged =@@ -2355,6 +2381,7 @@ const composerDraftStore = create<ComposerDraftStoreState>()(nextDraftThread.branch === existing.branch &&nextDraftThread.worktreePath === existing.worktreePath &&nextDraftThread.envMode === existing.envMode &&+ nextDraftThread.startFromOrigin === existing.startFromOrigin &&scopedThreadRefsEqual(nextDraftThread.promotedTo, existing.promotedTo);if (isUnchanged) {return state;diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.tsindex 0b802dd87..c99ae0af9 100644--- a/apps/web/src/hooks/useHandleNewThread.ts+++ b/apps/web/src/hooks/useHandleNewThread.ts@@ -20,6 +20,7 @@ import {selectProjectGroupingSettings,} from "../logicalProject";import { readThreadShell, useProjects, useThread } from "../state/entities";+import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";import { resolveThreadRouteTarget } from "../threadRoutes";import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";import { useSettings } from "./useSettings";@@ -27,6 +28,9 @@ import { useSettings } from "./useSettings";export function useNewThreadHandler() {const projects = useProjects();const projectGroupingSettings = useSettings(selectProjectGroupingSettings);+ const newWorktreesStartFromOrigin = useSettings(+ (settings) => settings.newWorktreesStartFromOrigin,+ );const router = useRouter();const getCurrentRouteTarget = useCallback(() => {const currentRouteParams = router.state.matches[router.state.matches.length - 1]?.params ?? {};@@ -40,6 +44,7 @@ export function useNewThreadHandler() {branch?: string | null;worktreePath?: string | null;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;},): Promise<void> => {const {@@ -62,6 +67,7 @@ export function useNewThreadHandler() {const hasBranchOption = options?.branch !== undefined;const hasWorktreePathOption = options?.worktreePath !== undefined;const hasEnvModeOption = options?.envMode !== undefined;+ const hasStartFromOriginOption = options?.startFromOrigin !== undefined;const storedDraftThread = getDraftSessionByLogicalProjectKey(logicalProjectKey);const storedDraftThreadRef = storedDraftThread? scopeThreadRef(storedDraftThread.environmentId, storedDraftThread.threadId)@@ -80,11 +86,17 @@ export function useNewThreadHandler() {: null;if (reusableStoredDraftThread) {return (async () => {- if (hasBranchOption || hasWorktreePathOption || hasEnvModeOption) {+ if (+ hasBranchOption ||+ hasWorktreePathOption ||+ hasEnvModeOption ||+ hasStartFromOriginOption+ ) {setDraftThreadContext(reusableStoredDraftThread.draftId, {...(hasBranchOption ? { branch: options?.branch ?? null } : {}),...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),...(hasEnvModeOption ? { envMode: options?.envMode } : {}),+ ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),});}setLogicalProjectDraftThreadId(@@ -114,11 +126,17 @@ export function useNewThreadHandler() {latestActiveDraftThread.logicalProjectKey === logicalProjectKey &&latestActiveDraftThread.promotedTo == null) {- if (hasBranchOption || hasWorktreePathOption || hasEnvModeOption) {+ if (+ hasBranchOption ||+ hasWorktreePathOption ||+ hasEnvModeOption ||+ hasStartFromOriginOption+ ) {setDraftThreadContext(currentRouteTarget.draftId, {...(hasBranchOption ? { branch: options?.branch ?? null } : {}),...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),...(hasEnvModeOption ? { envMode: options?.envMode } : {}),+ ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),});}setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, currentRouteTarget.draftId, {@@ -129,6 +147,7 @@ export function useNewThreadHandler() {...(hasBranchOption ? { branch: options?.branch ?? null } : {}),...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),...(hasEnvModeOption ? { envMode: options?.envMode } : {}),+ ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),});return Promise.resolve();}@@ -136,13 +155,20 @@ export function useNewThreadHandler() {const draftId = newDraftId();const threadId = newThreadId();const createdAt = new Date().toISOString();+ const initialEnvMode = options?.envMode ?? "local";return (async () => {setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, draftId, {threadId,createdAt,branch: options?.branch ?? null,worktreePath: options?.worktreePath ?? null,- envMode: options?.envMode ?? "local",+ envMode: initialEnvMode,+ startFromOrigin:+ options?.startFromOrigin ??+ resolveNewDraftStartFromOrigin({+ envMode: initialEnvMode,+ newWorktreesStartFromOrigin,+ }),runtimeMode: DEFAULT_RUNTIME_MODE,});applyStickyState(draftId);@@ -153,7 +179,7 @@ export function useNewThreadHandler() {});})();},- [getCurrentRouteTarget, projectGroupingSettings, router, projects],+ [newWorktreesStartFromOrigin, getCurrentRouteTarget, projectGroupingSettings, router, projects],);}diff --git a/apps/web/src/lib/chatThreadActions.test.ts b/apps/web/src/lib/chatThreadActions.test.tsindex 45d22b1df..62e5aa41d 100644--- a/apps/web/src/lib/chatThreadActions.test.ts+++ b/apps/web/src/lib/chatThreadActions.test.ts@@ -3,6 +3,7 @@ import { EnvironmentId, ProjectId } from "@t3tools/contracts";import { describe, expect, it, vi } from "vite-plus/test";import {resolveThreadActionProjectRef,+ resolveNewDraftStartFromOrigin,startNewLocalThreadFromContext,startNewThreadFromContext,type ChatThreadActionContext,@@ -24,6 +25,21 @@ function createContext(overrides: Partial<ChatThreadActionContext> = {}): ChatTh}describe("chatThreadActions", () => {+ it("only applies the start-from-origin default to new worktree drafts", () => {+ expect(+ resolveNewDraftStartFromOrigin({+ envMode: "worktree",+ newWorktreesStartFromOrigin: true,+ }),+ ).toBe(true);+ expect(+ resolveNewDraftStartFromOrigin({+ envMode: "local",+ newWorktreesStartFromOrigin: true,+ }),+ ).toBe(false);+ });+it("prefers the active draft thread project when resolving thread actions", () => {const projectRef = resolveThreadActionProjectRef(createContext({@@ -33,6 +49,7 @@ describe("chatThreadActions", () => {branch: "feature/refactor",worktreePath: "/tmp/worktree",envMode: "worktree",+ startFromOrigin: true,},}),);@@ -61,6 +78,7 @@ describe("chatThreadActions", () => {branch: "feature/refactor",worktreePath: "/tmp/worktree",envMode: "worktree",+ startFromOrigin: true,},handleNewThread,}),@@ -71,6 +89,32 @@ describe("chatThreadActions", () => {branch: "feature/refactor",worktreePath: "/tmp/worktree",envMode: "worktree",+ startFromOrigin: true,+ });+ });++ it("preserves an explicitly disabled origin base in contextual thread options", async () => {+ const handleNewThread = vi.fn<ChatThreadActionContext["handleNewThread"]>(async () => {});++ await startNewThreadFromContext(+ createContext({+ activeDraftThread: {+ environmentId: ENVIRONMENT_ID,+ projectId: PROJECT_ID,+ branch: "feature/refactor",+ worktreePath: "/tmp/worktree",+ envMode: "worktree",+ startFromOrigin: false,+ },+ handleNewThread,+ }),+ );++ expect(handleNewThread).toHaveBeenCalledWith(scopeProjectRef(ENVIRONMENT_ID, PROJECT_ID), {+ branch: "feature/refactor",+ worktreePath: "/tmp/worktree",+ envMode: "worktree",+ startFromOrigin: false,});});diff --git a/apps/web/src/lib/chatThreadActions.ts b/apps/web/src/lib/chatThreadActions.tsindex b434d1f51..63d0289d1 100644--- a/apps/web/src/lib/chatThreadActions.ts+++ b/apps/web/src/lib/chatThreadActions.ts@@ -11,6 +11,7 @@ interface ThreadContextLike {interface DraftThreadContextLike extends ThreadContextLike {envMode: DraftThreadEnvMode;+ startFromOrigin: boolean;}interface NewThreadHandler {@@ -20,6 +21,7 @@ interface NewThreadHandler {branch?: string | null;worktreePath?: string | null;envMode?: DraftThreadEnvMode;+ startFromOrigin?: boolean;},): Promise<void>;}@@ -34,6 +36,13 @@ export interface ChatThreadActionContext {readonly handleNewThread: NewThreadHandler;}+export function resolveNewDraftStartFromOrigin(input: {+ envMode: DraftThreadEnvMode;+ newWorktreesStartFromOrigin: boolean;+}): boolean {+ return input.envMode === "worktree" && input.newWorktreesStartFromOrigin;+}+export function resolveThreadActionProjectRef(context: ChatThreadActionContext,): ScopedProjectRef | null {@@ -57,6 +66,9 @@ function buildContextualThreadOptions(context: ChatThreadActionContext): NewThreenvMode:context.activeDraftThread?.envMode ??(context.activeThread?.worktreePath ? "worktree" : "local"),+ ...(context.activeDraftThread+ ? { startFromOrigin: context.activeDraftThread.startFromOrigin }+ : {}),};}diff --git a/packages/contracts/src/orchestration.test.ts b/packages/contracts/src/orchestration.test.tsindex 3dc83933e..29a732ca6 100644--- a/packages/contracts/src/orchestration.test.ts+++ b/packages/contracts/src/orchestration.test.ts@@ -277,6 +277,7 @@ it.effect("accepts bootstrap metadata in thread.turn.start", () =>projectCwd: "/tmp/workspace",baseBranch: "main",branch: "t3code/example",+ startFromOrigin: true,},runSetupScript: true,},@@ -284,6 +285,7 @@ it.effect("accepts bootstrap metadata in thread.turn.start", () =>});assert.strictEqual(parsed.bootstrap?.createThread?.projectId, "project-1");assert.strictEqual(parsed.bootstrap?.prepareWorktree?.baseBranch, "main");+ assert.strictEqual(parsed.bootstrap?.prepareWorktree?.startFromOrigin, true);assert.strictEqual(parsed.bootstrap?.runSetupScript, true);}),);diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.tsindex 46d51da37..623fed091 100644--- a/packages/contracts/src/orchestration.ts+++ b/packages/contracts/src/orchestration.ts@@ -565,6 +565,7 @@ const ThreadTurnStartBootstrapPrepareWorktree = Schema.Struct({projectCwd: TrimmedNonEmptyString,baseBranch: TrimmedNonEmptyString,branch: Schema.optional(TrimmedNonEmptyString),+ startFromOrigin: Schema.optional(Schema.Boolean),});const ThreadTurnStartBootstrap = Schema.Struct({diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.tsindex 04ee479bc..aba97cbe2 100644--- a/packages/contracts/src/settings.test.ts+++ b/packages/contracts/src/settings.test.ts@@ -64,6 +64,18 @@ describe("ServerSettings.providerInstances (slice-2 invariant)", () => {});});+describe("ServerSettings worktree defaults", () => {+ it("defaults start-from-origin off for legacy configs", () => {+ expect(decodeServerSettings({}).newWorktreesStartFromOrigin).toBe(false);+ });++ it("accepts start-from-origin updates", () => {+ expect(+ decodeServerSettingsPatch({ newWorktreesStartFromOrigin: true }).newWorktreesStartFromOrigin,+ ).toBe(true);+ });+});+describe("ServerSettingsPatch.providerInstances", () => {it("treats providerInstances as an optional whole-map replacement", () => {const patch = decodeServerSettingsPatch({});diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.tsindex 6955ab705..0463a4417 100644--- a/packages/contracts/src/settings.ts+++ b/packages/contracts/src/settings.ts@@ -373,6 +373,9 @@ export const ServerSettings = Schema.Struct({defaultThreadEnvMode: ThreadEnvMode.pipe(Schema.withDecodingDefault(Effect.succeed("local" as const satisfies ThreadEnvMode)),),+ newWorktreesStartFromOrigin: Schema.Boolean.pipe(+ Schema.withDecodingDefault(Effect.succeed(false)),+ ),addProjectBaseDirectory: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),textGenerationModelSelection: ModelSelection.pipe(Schema.withDecodingDefault(@@ -481,6 +484,7 @@ export const ServerSettingsPatch = Schema.Struct({enableAssistantStreaming: Schema.optionalKey(Schema.Boolean),automaticGitFetchInterval: Schema.optionalKey(Schema.DurationFromMillis),defaultThreadEnvMode: Schema.optionalKey(ThreadEnvMode),+ newWorktreesStartFromOrigin: Schema.optionalKey(Schema.Boolean),addProjectBaseDirectory: Schema.optionalKey(TrimmedString),textGenerationModelSelection: Schema.optionalKey(ModelSelectionPatch),observability: Schema.optionalKey(