chore(rebase): refresh main conflict resolution

Author: maria-rcks

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

@@ -415,8 +415,7 @@ const make = Effect.gen(function* () {
     const cwd = input.worktreePath;
     const attachments = input.attachments ?? [];
     yield* Effect.gen(function* () {
-      const { textGenerationModelSelection } =
-        yield* serverSettingsService.getSettings;
+      const { textGenerationModelSelection } = yield* serverSettingsService.getSettings;
 
       const generated = yield* textGeneration.generateBranchName({
         cwd,

apps/server/src/orchestration/decider.ts

@@ -14,6 +14,7 @@ import {
 } from "./commandInvariants.ts";
 
 const nowIso = () => new Date().toISOString();
+const DEFAULT_ASSISTANT_DELIVERY_MODE = "buffered" as const;
 
 const defaultMetadata: Omit<OrchestrationEvent, "sequence" | "type" | "payload"> = {
   eventId: crypto.randomUUID() as OrchestrationEvent["eventId"],

apps/web/src/components/ChatView.tsx

@@ -644,7 +644,27 @@ export default function ChatView({ threadId }: ChatViewProps) {
     [selectedModel, selectedModelOptionsForDispatch, selectedProvider],
   );
   const selectedTextGenerationModel = settings.textGenerationModelSelection.model;
-  const providerOptionsForDispatch = useMemo(() => getProviderStartOptions(settings), [settings]);
+  const providerOptionsForDispatch = useMemo(() => {
+    const providerOptions = {
+      ...(settings.providers.codex.binaryPath || settings.providers.codex.homePath
+        ? {
+            codex: {
+              binaryPath: settings.providers.codex.binaryPath,
+              homePath: settings.providers.codex.homePath,
+            },
+          }
+        : {}),
+      ...(settings.providers.claudeAgent.binaryPath
+        ? {
+            claudeAgent: {
+              binaryPath: settings.providers.claudeAgent.binaryPath,
+            },
+          }
+        : {}),
+    };
+
+    return Object.keys(providerOptions).length > 0 ? providerOptions : undefined;
+  }, [settings]);
   const selectedModelForPicker = selectedModel;
   const phase = derivePhase(activeThread?.session ?? null);
   const isSendBusy = sendPhase !== "idle";
@@ -3019,6 +3039,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     const outgoingImplementationPrompt = formatOutgoingPrompt({
       provider: selectedProvider,
       model: selectedModel,
+      models: selectedProviderModels,
       effort: selectedPromptEffort,
       text: implementationPrompt,
     });
@@ -3112,6 +3133,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
     selectedPromptEffort,
     selectedModelSelection,
     selectedProvider,
+    selectedProviderModels,
     settings.enableAssistantStreaming,
     providerOptionsForDispatch,
     selectedTextGenerationModel,

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

@@ -378,10 +378,6 @@ function SettingsRouteView() {
       : []),
     ...(isGitWritingModelDirty ? ["Text generation model"] : []),
     ...(areProviderSettingsDirty ? ["Providers"] : []),
-    ...(settings.customCodexModels.length > 0 || settings.customClaudeModels.length > 0
-      ? ["Custom models"]
-      : []),
-    ...(isInstallSettingsDirty ? ["Provider installs"] : []),
   ];
 
   const openKeybindingsFile = useCallback(() => {

packages/contracts/src/orchestration.ts

@@ -11,6 +11,7 @@ import {
   ProjectId,
   ProviderItemId,
   ThreadId,
+  TrimmedString,
   TrimmedNonEmptyString,
   TurnId,
 } from "./baseSchemas";
@@ -42,6 +43,21 @@ export const ProviderSandboxMode = Schema.Literals([
   "danger-full-access",
 ]);
 export type ProviderSandboxMode = typeof ProviderSandboxMode.Type;
+
+export const ProviderStartOptions = Schema.Struct({
+  codex: Schema.optional(
+    Schema.Struct({
+      binaryPath: TrimmedString,
+      homePath: TrimmedString,
+    }),
+  ),
+  claudeAgent: Schema.optional(
+    Schema.Struct({
+      binaryPath: TrimmedString,
+    }),
+  ),
+});
+export type ProviderStartOptions = typeof ProviderStartOptions.Type;
 export const DEFAULT_PROVIDER_KIND: ProviderKind = "codex";
 
 export const CodexModelSelection = Schema.Struct({