Skip to content

fix(web): apply sticky model selection when reusing draft threads #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoeEverest wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −7
Open

fix(web): apply sticky model selection when reusing draft threads #1277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions apps/web/src/hooks/useHandleNewThread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ export function useHandleNewThread() {
const hasBranchOption = options?.branch !== undefined;
const hasWorktreePathOption = options?.worktreePath !== undefined;
const hasEnvModeOption = options?.envMode !== undefined;
const applyStickyModel = (threadId: ThreadId, draftModel?: string | null) => {
if (stickyModel && !draftModel) {
setProvider(threadId, inferProviderForModel(stickyModel));
setModel(threadId, stickyModel);
}
if (!draftModel && Object.keys(stickyModelOptions).length > 0) {
setModelOptions(threadId, stickyModelOptions);
}
};

const storedDraftThread = getDraftThreadByProjectId(projectId);
const latestActiveDraftThread: DraftThreadState | null = routeThreadId
? getDraftThread(routeThreadId)
Expand All @@ -64,6 +74,9 @@ export function useHandleNewThread() {
});
}
setProjectDraftThreadId(projectId, storedDraftThread.threadId);
const existingDraft =
useComposerDraftStore.getState().draftsByThreadId[storedDraftThread.threadId];
applyStickyModel(storedDraftThread.threadId, existingDraft?.model);
if (routeThreadId === storedDraftThread.threadId) {
return;
}
Expand All @@ -89,6 +102,8 @@ export function useHandleNewThread() {
});
}
setProjectDraftThreadId(projectId, routeThreadId);
const existingDraft = useComposerDraftStore.getState().draftsByThreadId[routeThreadId];
applyStickyModel(routeThreadId, existingDraft?.model);
return Promise.resolve();
}

Expand All @@ -102,13 +117,7 @@ export function useHandleNewThread() {
envMode: options?.envMode ?? "local",
runtimeMode: DEFAULT_RUNTIME_MODE,
});
if (stickyModel) {
setProvider(threadId, inferProviderForModel(stickyModel));
setModel(threadId, stickyModel);
}
if (Object.keys(stickyModelOptions).length > 0) {
setModelOptions(threadId, stickyModelOptions);
}
applyStickyModel(threadId);

await navigate({
to: "/$threadId",
Expand Down