Skip to content

🤖 Fix intermittent Cmd+Shift+T keybind failure #254

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

Merged
merged 2 commits into from
Oct 15, 2025
Merged

🤖 Fix intermittent Cmd+Shift+T keybind failure #254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a257603
🤖 Fix Cmd+Shift+T keybind failing in new chats
ammar-agent Oct 14, 2025
00d13c8
🤖 Use defaultModel fallback to match UI behavior
ammar-agent Oct 15, 2025
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
16 changes: 9 additions & 7 deletions src/hooks/useAIViewKeybinds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { useEffect } from "react";
import type { ChatInputAPI } from "@/components/ChatInput";
import { matchesKeybind, KEYBINDS, isEditableElement } from "@/utils/ui/keybinds";
import { getLastThinkingByModelKey } from "@/constants/storage";
import { getLastThinkingByModelKey, getModelKey } from "@/constants/storage";
import { updatePersistedState, readPersistedState } from "@/hooks/usePersistedState";
import type { ThinkingLevel, ThinkingLevelOn } from "@/types/thinking";
import { DEFAULT_THINKING_LEVEL } from "@/types/thinking";
import { getThinkingPolicyForModel } from "@/utils/thinking/policy";
import { defaultModel } from "@/utils/ai/models";

interface UseAIViewKeybindsParams {
workspaceId: string;
Expand Down Expand Up @@ -64,17 +65,18 @@ export function useAIViewKeybinds({
if (matchesKeybind(e, KEYBINDS.TOGGLE_THINKING)) {
e.preventDefault();

// Skip if no model set (workspace has no messages yet)
if (!currentModel) {
return;
}
// Get selected model from localStorage (what user sees in UI)
// Fall back to message history model, then to default model
// This matches the same logic as useSendMessageOptions
const selectedModel = readPersistedState<string | null>(getModelKey(workspaceId), null);
const modelToUse = selectedModel ?? currentModel ?? defaultModel;

// Storage key for remembering this model's last-used active thinking level
const lastThinkingKey = getLastThinkingByModelKey(currentModel);
const lastThinkingKey = getLastThinkingByModelKey(modelToUse);

// Special-case: if model has single-option policy (e.g., gpt-5-pro only supports HIGH),
// the toggle is a no-op to avoid confusing state transitions.
const allowed = getThinkingPolicyForModel(currentModel);
const allowed = getThinkingPolicyForModel(modelToUse);
if (allowed.length === 1) {
return; // No toggle for single-option policies
}
Expand Down