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.
fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees from origin main (#4240)
Theo Browne62cf4617594c
diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.tsxindex ee2bde9d9..74fe2f485 100644--- a/apps/mobile/src/features/threads/new-task-flow-provider.tsx+++ b/apps/mobile/src/features/threads/new-task-flow-provider.tsx@@ -58,6 +58,8 @@ import { type VcsRef } from "@t3tools/client-runtime/state/vcs";type WorkspaceMode = "local" | "worktree";+const EMPTY_BRANCH_REFS: ReadonlyArray<VcsRef> = [];+function pendingTaskDraftKey(messageId: string): string {return `pending-task:${messageId}`;}@@ -348,7 +350,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {const workspaceMode = selectedProjectDraft.workspaceSelection?.mode ?? "local";const selectedBranchName = selectedProjectDraft.workspaceSelection?.branch ?? null;const selectedWorktreePath = selectedProjectDraft.workspaceSelection?.worktreePath ?? null;- const startFromOrigin = selectedProjectDraft.workspaceSelection?.startFromOrigin ?? false;+ // Keep the user's explicit choice separate from the resolved display value:+ // only the explicit flag is ever written back to the draft, so the resolved+ // value keeps tracking the server setting when the config loads late.+ const draftStartFromOrigin = selectedProjectDraft.workspaceSelection?.startFromOrigin;+ const startFromOrigin =+ draftStartFromOrigin ??+ selectedEnvironmentServerConfig?.settings.newWorktreesStartFromOrigin ??+ true;const runtimeMode = selectedProjectDraft.runtimeMode ?? DEFAULT_RUNTIME_MODE;const interactionMode = selectedProjectDraft.interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE;@@ -368,6 +377,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {const selectedModel =selectedProjectDraft.modelSelection ??selectedProject?.defaultModelSelection ??+ modelOptions.find((option) => option.isDefault)?.selection ??modelOptions[0]?.selection ??null;const selectedModelKey = selectedModel@@ -475,13 +485,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {);const branchState = useBranches(branchTarget);const branchesLoading = branchState.isPending;+ const allBranchRefs = branchState.data?.refs ?? EMPTY_BRANCH_REFS;const availableBranches = useMemo(() =>pipe(- branchState.data?.refs ?? [],+ allBranchRefs,Arr.filter((branch) => !branch.isRemote),),- [branchState.data?.refs],+ [allBranchRefs],);const filteredBranches = useMemo(() => {@@ -543,11 +554,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {mode,branch: selectedBranchName,worktreePath: selectedWorktreePath,- startFromOrigin,+ ...(draftStartFromOrigin !== undefined ? { startFromOrigin: draftStartFromOrigin } : {}),},});},- [selectedBranchName, selectedProjectDraftKey, selectedWorktreePath, startFromOrigin],+ [draftStartFromOrigin, selectedBranchName, selectedProjectDraftKey, selectedWorktreePath],);const selectBranch = useCallback(@@ -560,11 +571,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {mode: workspaceMode,branch: branch.name,worktreePath: normalizeSelectedWorktreePath(selectedProject, branch),- startFromOrigin,+ ...(draftStartFromOrigin !== undefined ? { startFromOrigin: draftStartFromOrigin } : {}),},});},- [selectedProject, selectedProjectDraftKey, startFromOrigin, workspaceMode],+ [draftStartFromOrigin, selectedProject, selectedProjectDraftKey, workspaceMode],);const setStartFromOrigin = useCallback(@@ -597,14 +608,16 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {if (workspaceMode !== "worktree" || selectedBranchName !== null) {return;}+ // The default may only exist as origin/<default> (isRemote), which+ // availableBranches filters out — search the unfiltered refs for it.const preferredBranch =+ allBranchRefs.find((branch) => branch.isDefault) ??availableBranches.find((branch) => branch.current) ??- availableBranches.find((branch) => branch.isDefault) ??null;if (preferredBranch) {selectBranch(preferredBranch);}- }, [availableBranches, selectBranch, selectedBranchName, workspaceMode]);+ }, [allBranchRefs, availableBranches, selectBranch, selectedBranchName, workspaceMode]);const setRuntimeMode = useCallback((value: RuntimeMode) => {@@ -696,7 +709,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {workspaceMode: mode,branch: workspaceSelection?.branch ?? null,worktreePath: mode === "worktree" ? null : (workspaceSelection?.worktreePath ?? null),- ...(workspaceSelection?.startFromOrigin ? { startFromOrigin: true } : {}),+ // The draft only carries the flag when the user touched it; fall+ // back to the resolved default (server settings) so queued tasks+ // drain with the same origin mode the composer displayed.+ ...((workspaceSelection?.startFromOrigin ?? startFromOrigin)+ ? { startFromOrigin: true }+ : {}),},createdAt: metadata.createdAt,};@@ -707,6 +725,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {selectedModel,selectedProject,selectedProjectDraftKey,+ startFromOrigin,],);diff --git a/apps/mobile/src/lib/modelOptions.ts b/apps/mobile/src/lib/modelOptions.tsindex e21682414..ab859c73b 100644--- a/apps/mobile/src/lib/modelOptions.ts+++ b/apps/mobile/src/lib/modelOptions.ts@@ -15,6 +15,7 @@ export type ModelOption = {readonly providerKey: string;readonly providerLabel: string;readonly providerDriver: string;+ readonly isDefault: boolean;readonly capabilities: ModelCapabilities | null;readonly selection: ModelSelection;};@@ -78,6 +79,7 @@ export function buildModelOptions(providerKey: provider.instanceId,providerLabel,providerDriver: provider.driver,+ isDefault: model.isDefault === true,capabilities: model.capabilities,selection: normalizeSelectionOptions({@@ -107,6 +109,7 @@ export function buildModelOptions(providerKey: fallbackModelSelection.instanceId,providerLabel,providerDriver: fallbackModelSelection.instanceId,+ isDefault: false,capabilities: null,selection: fallbackModelSelection,});diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.tsindex 17aeff2d0..3e883fa1c 100644--- a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts@@ -3045,7 +3045,7 @@ describe("ClaudeAdapterLive", () => {attachments: [],});- assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6"]);+ assert.deepEqual(harness.query.setModelCalls, ["claude-opus-4-6[1m]"]);}).pipe(Effect.provideService(Random.Random, makeDeterministicRandomService()),Effect.provide(harness.layer),@@ -3143,10 +3143,11 @@ describe("ClaudeAdapterLive", () => {yield* adapter.sendTurn({threadId: session.threadId,input: "hello again",- modelSelection: {- instanceId: ProviderInstanceId.make("claudeAgent"),- model: "claude-opus-4-6",- },+ modelSelection: createModelSelection(+ ProviderInstanceId.make("claudeAgent"),+ "claude-opus-4-6",+ [{ id: "contextWindow", value: "200k" }],+ ),attachments: [],});diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.tsindex f6e63eeff..5ccd011ef 100644--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts@@ -77,6 +77,7 @@ import {isClaudeUltracodeEffort,normalizeClaudeCliEffort,resolveClaudeApiModelId,+ resolveClaudeContextWindow,resolveClaudeEffort,} from "./ClaudeProvider.ts";import {@@ -341,24 +342,18 @@ function selectedClaudeContextWindow(switch (modelSelection?.model) {case "claude-opus-4-8":case "claude-opus-4-7":+ // Always 1M at the API; these models expose no contextWindow option.return 1_000_000;}- const optionValue = getModelSelectionStringOptionValue(modelSelection, "contextWindow");- if (optionValue === "1m") {- return 1_000_000;- }- if (optionValue === "200k") {- return 200_000;- }- const caps = getClaudeModelCapabilities(modelSelection?.model);- const hasContextWindowOption = getProviderOptionDescriptors({ caps }).some(- (descriptor) => descriptor.type === "select" && descriptor.id === "contextWindow",- );- if (hasContextWindowOption) {- return 200_000;+ switch (resolveClaudeContextWindow(modelSelection)) {+ case "1m":+ return 1_000_000;+ case "200k":+ return 200_000;+ default:+ return undefined;}- return undefined;}function finiteNonNegativeInteger(value: unknown): number | undefined {diff --git a/apps/server/src/provider/Layers/ClaudeProvider.ts b/apps/server/src/provider/Layers/ClaudeProvider.tsindex ff0d19924..9df672f54 100644--- a/apps/server/src/provider/Layers/ClaudeProvider.ts+++ b/apps/server/src/provider/Layers/ClaudeProvider.ts@@ -76,8 +76,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [id: "contextWindow",label: "Context Window",options: [- { value: "200k", label: "200k", isDefault: true },- { value: "1m", label: "1M" },+ { value: "200k", label: "200k" },+ { value: "1m", label: "1M", isDefault: true },],}),],@@ -162,8 +162,8 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [id: "contextWindow",label: "Context Window",options: [- { value: "200k", label: "200k", isDefault: true },- { value: "1m", label: "1M" },+ { value: "200k", label: "200k" },+ { value: "1m", label: "1M", isDefault: true },],}),],@@ -214,6 +214,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [buildSelectOptionDescriptor({id: "contextWindow",label: "Context Window",+ // Sonnet is 200k-default in Claude Code (1M is opt-in there too).options: [{ value: "200k", label: "200k", isDefault: true },{ value: "1m", label: "1M" },@@ -243,6 +244,7 @@ const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [buildSelectOptionDescriptor({id: "contextWindow",label: "Context Window",+ // Sonnet is 200k-default in Claude Code (1M is opt-in there too).options: [{ value: "200k", label: "200k", isDefault: true },{ value: "1m", label: "1M" },@@ -369,8 +371,22 @@ export function isClaudeUltracodeEffort(effort: string | null | undefined): boolreturn effort === "ultracode";}+export function resolveClaudeContextWindow(+ modelSelection: ModelSelection | undefined,+): string | undefined {+ const caps = getClaudeModelCapabilities(modelSelection?.model);+ const raw = getModelSelectionStringOptionValue(modelSelection, "contextWindow");+ const descriptors = getProviderOptionDescriptors({+ caps,+ ...(raw ? { selections: [{ id: "contextWindow", value: raw }] } : {}),+ });+ const descriptor = descriptors.find((candidate) => candidate.id === "contextWindow");+ const value = getProviderOptionCurrentValue(descriptor);+ return typeof value === "string" ? value : undefined;+}+export function resolveClaudeApiModelId(modelSelection: ModelSelection): string {- switch (getModelSelectionStringOptionValue(modelSelection, "contextWindow")) {+ switch (resolveClaudeContextWindow(modelSelection)) {case "1m":return `${modelSelection.model}[1m]`;default:diff --git a/apps/server/src/provider/Layers/CodexProvider.test.ts b/apps/server/src/provider/Layers/CodexProvider.test.tsindex 0e21b7630..2aeebdb2c 100644--- a/apps/server/src/provider/Layers/CodexProvider.test.ts+++ b/apps/server/src/provider/Layers/CodexProvider.test.ts@@ -1,6 +1,6 @@import { assert, it } from "@effect/vitest";-import { mapCodexModelCapabilities } from "./CodexProvider.ts";+import { applyPreferredCodexDefaultModel, mapCodexModelCapabilities } from "./CodexProvider.ts";it("maps current Codex model capability fields", () => {const capabilities = mapCodexModelCapabilities({@@ -102,3 +102,45 @@ it("uses standard routing when the catalog has no default service tier", () => {},]);});++it("marks the most preferred available model as default", () => {+ const models = applyPreferredCodexDefaultModel([+ { slug: "gpt-5.6-terra", name: "GPT-5.6-Terra", isCustom: false, capabilities: null },+ { slug: "gpt-5.4", name: "GPT-5.4", isCustom: false, isDefault: true, capabilities: null },+ ]);++ assert.deepStrictEqual(+ models.map((model) => ({ slug: model.slug, isDefault: model.isDefault })),+ [+ { slug: "gpt-5.6-terra", isDefault: true },+ { slug: "gpt-5.4", isDefault: undefined },+ ],+ );+});++it("prefers sol over terra when both are available", () => {+ const models = applyPreferredCodexDefaultModel([+ { slug: "gpt-5.6-terra", name: "GPT-5.6-Terra", isCustom: false, capabilities: null },+ { slug: "gpt-5.6-sol", name: "GPT-5.6-Sol", isCustom: false, capabilities: null },+ ]);++ assert.deepStrictEqual(models.find((model) => model.isDefault)?.slug, "gpt-5.6-sol");+});++it("keeps Codex's own default when no preferred model is available", () => {+ const models = applyPreferredCodexDefaultModel([+ { slug: "gpt-5.5", name: "GPT-5.5", isCustom: false, capabilities: null },+ { slug: "gpt-5.4", name: "GPT-5.4", isCustom: false, isDefault: true, capabilities: null },+ ]);++ assert.deepStrictEqual(models.find((model) => model.isDefault)?.slug, "gpt-5.4");+});++it("ignores custom models that shadow a preferred slug", () => {+ const models = applyPreferredCodexDefaultModel([+ { slug: "gpt-5.6-sol", name: "gpt-5.6-sol", isCustom: true, capabilities: null },+ { slug: "gpt-5.4", name: "GPT-5.4", isCustom: false, isDefault: true, capabilities: null },+ ]);++ assert.deepStrictEqual(models.find((model) => model.isDefault)?.slug, "gpt-5.4");+});diff --git a/apps/server/src/provider/Layers/CodexProvider.ts b/apps/server/src/provider/Layers/CodexProvider.tsindex 9306087a0..1ed9c750c 100644--- a/apps/server/src/provider/Layers/CodexProvider.ts+++ b/apps/server/src/provider/Layers/CodexProvider.ts@@ -22,7 +22,7 @@ import type {ServerProviderModel,ServerProviderSkill,} from "@t3tools/contracts";-import { ServerSettingsError } from "@t3tools/contracts";+import { PREFERRED_DEFAULT_CODEX_MODELS, ServerSettingsError } from "@t3tools/contracts";import { createModelCapabilities } from "@t3tools/shared/model";import { resolveSpawnCommand } from "@t3tools/shared/shell";@@ -189,10 +189,36 @@ function parseCodexModelListResponse(slug: model.model,name: toDisplayName(model),isCustom: false,+ ...(model.isDefault ? { isDefault: true } : {}),capabilities: mapCodexModelCapabilities(model),}));}+/**+ * Prefer our own default-model ranking when one of the preferred slugs is in+ * the live catalog; otherwise keep whatever Codex itself flagged as default.+ */+export function applyPreferredCodexDefaultModel(+ models: ReadonlyArray<ServerProviderModel>,+): ReadonlyArray<ServerProviderModel> {+ const preferredSlug = PREFERRED_DEFAULT_CODEX_MODELS.find((slug) =>+ models.some((model) => model.slug === slug && !model.isCustom),+ );+ if (!preferredSlug) {+ return models;+ }+ return models.map((model) => {+ if (model.slug === preferredSlug) {+ return model.isDefault ? model : { ...model, isDefault: true };+ }+ if (!model.isDefault) {+ return model;+ }+ const { isDefault: _isDefault, ...rest } = model;+ return rest;+ });+}+function appendCustomCodexModels(models: ReadonlyArray<ServerProviderModel>,customModels: ReadonlyArray<string>,@@ -376,7 +402,9 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(funreturn {account: accountResponse,version,- models: appendCustomCodexModels(models, input.customModels ?? []),+ models: applyPreferredCodexDefaultModel(+ appendCustomCodexModels(models, input.customModels ?? []),+ ),skills: parseCodexSkillsListResponse(skillsResponse, input.cwd),} satisfies CodexAppServerProviderSnapshot;});diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.tsindex 8c627525b..9ffd3ed69 100644--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts@@ -596,6 +596,26 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {}),);+ it.effect("marks the origin default ref as default when no local copy exists", () =>+ Effect.gen(function* () {+ const cwd = yield* makeTmpDir();+ const remote = yield* makeTmpDir("git-vcs-driver-remote-");+ 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(cwd, ["remote", "set-head", "origin", initialBranch]);+ yield* git(cwd, ["checkout", "-b", "feature/only-local"]);+ yield* git(cwd, ["branch", "-D", initialBranch]);+ const driver = yield* GitVcsDriver.GitVcsDriver;++ const refs = yield* driver.listRefs({ cwd });+ const remoteDefault = refs.refs.find((ref) => ref.name === `origin/${initialBranch}`);+ assert.equal(remoteDefault?.isRemote, true);+ assert.equal(remoteDefault?.isDefault, true);+ }),+ );+it.effect("creates, checks out, renames, and lists refs", () =>Effect.gen(function* () {const cwd = yield* makeTmpDir();diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.tsindex 6293ff7c2..471ec10b5 100644--- a/apps/server/src/vcs/GitVcsDriverCore.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.ts@@ -2217,7 +2217,12 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*name: refName.name,current: false,isRemote: true,- isDefault: false,+ // origin/HEAD's target is the repo default even when no local+ // copy of the default branch exists.+ isDefault:+ defaultBranch !== null &&+ parsedRemoteRef?.remoteName === "origin" &&+ parsedRemoteRef.branchName === defaultBranch,worktreePath: null,};if (parsedRemoteRef) {@@ -2232,9 +2237,16 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*}): [];- const allBranches = input.includeMatchingRemoteRefs+ const combinedBranches = input.includeMatchingRemoteRefs? [...localBranches, ...remoteBranches]: dedupeRemoteBranchesWithLocalMatches([...localBranches, ...remoteBranches]);+ // Keep current/default refs on the first page even when the default+ // only exists as origin/<default> (remote refs sort after all locals).+ const allBranches = combinedBranches.toSorted((a, b) => {+ const aPriority = a.current ? 0 : a.isDefault ? 1 : 2;+ const bPriority = b.current ? 0 : b.isDefault ? 1 : 2;+ return aPriority - bPriority;+ });const branchesForKind =input.refKind === "local"? allBranches.filter((ref) => !ref.isRemote)diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsxindex e2ee24c36..67ae3a818 100644--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx@@ -422,17 +422,32 @@ export function BranchToolbarBranchSelector({});};+ // Default the worktree base to the repo default branch (origin/HEAD), only+ // falling back to the checked-out branch when no default is known.+ const defaultBranchName = useMemo(+ () => refs.find((refName) => refName.isDefault)?.name ?? null,+ [refs],+ );+ const worktreeBaseBranchCandidate = isInitialBranchesLoadPending+ ? null+ : (defaultBranchName ?? currentGitBranch);useEffect(() => {if (effectiveEnvMode !== "worktree" ||activeWorktreePath ||activeThreadBranch ||- !currentGitBranch+ !worktreeBaseBranchCandidate) {return;}- setThreadBranch(currentGitBranch, null);- }, [activeThreadBranch, activeWorktreePath, currentGitBranch, effectiveEnvMode, setThreadBranch]);+ setThreadBranch(worktreeBaseBranchCandidate, null);+ }, [+ activeThreadBranch,+ activeWorktreePath,+ effectiveEnvMode,+ setThreadBranch,+ worktreeBaseBranchCandidate,+ ]);// ---------------------------------------------------------------------------// Combobox / list plumbingdiff --git a/apps/web/src/modelSelection.ts b/apps/web/src/modelSelection.tsindex f1d527880..ec089d766 100644--- a/apps/web/src/modelSelection.ts+++ b/apps/web/src/modelSelection.ts@@ -75,6 +75,7 @@ export interface AppModelOption {shortName?: string;subProvider?: string;isCustom: boolean;+ isDefault?: boolean;}function toAppModelOption(model: ServerProvider["models"][number]): AppModelOption {@@ -85,6 +86,7 @@ function toAppModelOption(model: ServerProvider["models"][number]): AppModelOpti};if (model.shortName) option.shortName = model.shortName;if (model.subProvider) option.subProvider = model.subProvider;+ if (model.isDefault) option.isDefault = true;return option;}@@ -247,7 +249,9 @@ export function resolveAppModelSelectionForInstance(const options = getAppModelOptionsForInstance(settings, entry);return (resolveSelectableModel(entry.driverKind, selectedModel, options) ??+ options.find((option) => option.isDefault)?.slug ??options[0]?.slug ??+ entry.models.find((model) => model.isDefault)?.slug ??entry.models[0]?.slug ??null);diff --git a/apps/web/src/providerModels.ts b/apps/web/src/providerModels.tsindex aa9afcf31..9715344cb 100644--- a/apps/web/src/providerModels.ts+++ b/apps/web/src/providerModels.ts@@ -92,6 +92,7 @@ export function getDefaultServerModel(): string {const models = getProviderModels(providers, provider);return (+ models.find((model) => model.isDefault && !model.isCustom)?.slug ??models.find((model) => !model.isCustom)?.slug ??models[0]?.slug ??DEFAULT_MODEL_BY_PROVIDER[provider] ??diff --git a/packages/client-runtime/src/operations/projects.test.ts b/packages/client-runtime/src/operations/projects.test.tsindex bf4e2c893..f3bc72603 100644--- a/packages/client-runtime/src/operations/projects.test.ts+++ b/packages/client-runtime/src/operations/projects.test.ts@@ -1,5 +1,6 @@import { describe, expect, it } from "vite-plus/test";import {+ DEFAULT_MODEL,EnvironmentId,ProjectId,CommandId,@@ -139,7 +140,7 @@ describe("add project shared logic", () => {createWorkspaceRootIfMissing: true,defaultModelSelection: {instanceId: "codex",- model: "gpt-5.4",+ model: DEFAULT_MODEL,},});});diff --git a/packages/contracts/src/model.ts b/packages/contracts/src/model.tsindex dddf3f374..8c74c13b8 100644--- a/packages/contracts/src/model.ts+++ b/packages/contracts/src/model.ts@@ -133,8 +133,18 @@ const CURSOR_DRIVER_KIND = ProviderDriverKind.make("cursor");const GROK_DRIVER_KIND = ProviderDriverKind.make("grok");const OPENCODE_DRIVER_KIND = ProviderDriverKind.make("opencode");-export const DEFAULT_MODEL = "gpt-5.4";-export const DEFAULT_GIT_TEXT_GENERATION_MODEL = "gpt-5.4-mini";+export const DEFAULT_MODEL = "gpt-5.6-sol";++/**+ * Codex default-model preference, most preferred first. The provider snapshot+ * marks the first of these present in the live `model/list` response as+ * default; when none are available, Codex's own `isDefault` flag wins.+ */+export const PREFERRED_DEFAULT_CODEX_MODELS: ReadonlyArray<string> = [+ "gpt-5.6-sol",+ "gpt-5.6-terra",+];+export const DEFAULT_GIT_TEXT_GENERATION_MODEL = "gpt-5.6-luna";export const DEFAULT_MODEL_BY_PROVIDER: Partial<Record<ProviderDriverKind, string>> = {[CODEX_DRIVER_KIND]: DEFAULT_MODEL,diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.tsindex 316f09693..3d99b8e95 100644--- a/packages/contracts/src/server.ts+++ b/packages/contracts/src/server.ts@@ -64,6 +64,7 @@ export const ServerProviderModel = Schema.Struct({shortName: Schema.optional(TrimmedNonEmptyString),subProvider: Schema.optional(TrimmedNonEmptyString),isCustom: Schema.Boolean,+ isDefault: Schema.optional(Schema.Boolean),capabilities: Schema.NullOr(ModelCapabilities),});export type ServerProviderModel = typeof ServerProviderModel.Type;diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.tsindex 0f618729c..a79042a28 100644--- a/packages/contracts/src/settings.test.ts+++ b/packages/contracts/src/settings.test.ts@@ -88,14 +88,14 @@ 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("defaults start-from-origin on for legacy configs", () => {+ expect(decodeServerSettings({}).newWorktreesStartFromOrigin).toBe(true);});it("accepts start-from-origin updates", () => {expect(- decodeServerSettingsPatch({ newWorktreesStartFromOrigin: true }).newWorktreesStartFromOrigin,- ).toBe(true);+ decodeServerSettingsPatch({ newWorktreesStartFromOrigin: false }).newWorktreesStartFromOrigin,+ ).toBe(false);});});diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.tsindex fe593f491..b983aa8a3 100644--- a/packages/contracts/src/settings.ts+++ b/packages/contracts/src/settings.ts@@ -382,7 +382,7 @@ export const ServerSettings = Schema.Struct({Schema.withDecodingDefault(Effect.succeed("local" as const satisfies ThreadEnvMode)),),newWorktreesStartFromOrigin: Schema.Boolean.pipe(- Schema.withDecodingDefault(Effect.succeed(false)),+ Schema.withDecodingDefault(Effect.succeed(true)),),addProjectBaseDirectory: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),textGenerationModelSelection: ModelSelection.pipe(