Fix effort and provider handling in thread turn start

- Only include `effort` in start command when a value is selected - Persist effort selection via composer draft state and hide picker when unavailable - Add optional `provider` to `ClientThreadTurnStartCommand` - Simplify thread model fallback selection in `ChatView`

Julius Marminge committed 8 months ago

Commit feff8661 parent ad28eaa2 files · +11 −14Browse files

Unified · Split

2 files

apps/web/src/components/ChatView.tsx +10 −14
packages/contracts/src/orchestration.ts +1 −0

apps/web/src/components/ChatView.tsx+10−14

         }
       }
       const title = truncateTitle(titleSeed);
-      let threadCreateModel = selectedModel;
+      let threadCreateModel: ModelSlug = selectedModel || (activeProject.model as ModelSlug) || DEFAULT_MODEL;
-      if (!threadCreateModel) {
-        threadCreateModel = activeProject.model;
-      }
-      if (!threadCreateModel) {
-        threadCreateModel = DEFAULT_MODEL;
-      }
       if (isLocalDraftThread) {
         await api.orchestration.dispatchCommand({
         },
         model: selectedModel || undefined,
         provider: selectedProvider,
-        ...(supportsReasoningEffort ? { effort: selectedEffort } : {}),
+        ...(supportsReasoningEffort && selectedEffort ? { effort: selectedEffort } : {}),
         assistantDeliveryMode: settings.enableAssistantStreaming ? "streaming" : "buffered",
         approvalPolicy,
         sandboxMode,
   );
   const onEffortSelect = useCallback(
     (effort: CodexReasoningEffort) => {
-      setSelectedEffort(effort);
+      setComposerDraftEffort(threadId, effort);
       scheduleComposerFocus();
     },
     [scheduleComposerFocus, setComposerDraftEffort, threadId],
                     <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
                     {/* Reasoning effort */}
-                    <ReasoningEffortPicker
+                    {selectedEffort != null && (
-                      effort={selectedEffort}
+                      <ReasoningEffortPicker
-                      options={reasoningOptions}
+                        effort={selectedEffort}
-                      onEffortChange={onEffortSelect}
+                        options={reasoningOptions}
-                    />
+                        onEffortChange={onEffortSelect}
+                      />
+                    )}
                   </>
                 ) : null}

packages/contracts/src/orchestration.ts+1−0

@@ -348,6 +348,7 @@ export const ClientThreadTurnStartCommand = Schema.Struct({ · 347 unmodified lines
348	text: Schema.String,	348	text: Schema.String,
349	attachments: Schema.Array(UploadChatAttachment),	349	attachments: Schema.Array(UploadChatAttachment),
350	}),	350	}),
		351	provider: Schema.optional(ProviderKind),
351	model: Schema.optional(TrimmedNonEmptyString),	352	model: Schema.optional(TrimmedNonEmptyString),
352	effort: Schema.optional(TrimmedNonEmptyString),	353	effort: Schema.optional(TrimmedNonEmptyString),
353	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),	354	assistantDeliveryMode: Schema.optional(AssistantDeliveryMode),

Fix effort and provider handling in thread turn start

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code