{
+ setSelectedSubChatClaudeThinking(thinking)
+ setLastSelectedClaudeThinking(thinking)
+ },
}}
codex={{
models: codexUiModels,
diff --git a/src/renderer/features/agents/main/new-chat-form.tsx b/src/renderer/features/agents/main/new-chat-form.tsx
index 6f0f61381..f08364df3 100644
--- a/src/renderer/features/agents/main/new-chat-form.tsx
+++ b/src/renderer/features/agents/main/new-chat-form.tsx
@@ -31,6 +31,7 @@ import {
agentsDebugModeAtom,
justCreatedIdsAtom,
lastSelectedAgentIdAtom,
+ lastSelectedClaudeThinkingAtom,
lastSelectedCodexModelIdAtom,
lastSelectedCodexThinkingAtom,
lastSelectedBranchesAtom,
@@ -58,7 +59,6 @@ import {
codexApiKeyAtom,
codexOnboardingCompletedAtom,
customClaudeConfigAtom,
- extendedThinkingEnabledAtom,
hiddenModelsAtom,
normalizeCodexApiKey,
normalizeCustomClaudeConfig,
@@ -121,6 +121,7 @@ import {
import {
CLAUDE_MODELS,
CODEX_MODELS,
+ type ClaudeThinkingLevel,
type CodexThinkingLevel,
} from "../lib/models"
// import type { PlanType } from "@/lib/config/subscription-plans"
@@ -136,10 +137,10 @@ function useAvailableModels() {
const baseModels = CLAUDE_MODELS
- const isOffline = ollamaStatus ? !ollamaStatus.internet.online : false
- const hasOllama = ollamaStatus?.ollama.available && (ollamaStatus.ollama.models?.length ?? 0) > 0
- const ollamaModels = ollamaStatus?.ollama.models || []
- const recommendedModel = ollamaStatus?.ollama.recommendedModel
+ const isOffline = ollamaStatus ? !(ollamaStatus.internet?.online ?? true) : false
+ const hasOllama = ollamaStatus?.ollama?.available && (ollamaStatus.ollama?.models?.length ?? 0) > 0
+ const ollamaModels = ollamaStatus?.ollama?.models || []
+ const recommendedModel = ollamaStatus?.ollama?.recommendedModel
// Only show offline models if:
// 1. Debug flag is enabled (showOfflineFeatures)
@@ -327,8 +328,8 @@ export function NewChatForm({
const [lastSelectedCodexThinking, setLastSelectedCodexThinking] = useAtom(
lastSelectedCodexThinkingAtom,
)
- const [thinkingEnabled, setThinkingEnabled] = useAtom(
- extendedThinkingEnabledAtom,
+ const [lastSelectedClaudeThinking, setLastSelectedClaudeThinking] = useAtom(
+ lastSelectedClaudeThinkingAtom,
)
const [selectedModel, setSelectedModel] = useState(
@@ -397,6 +398,34 @@ export function NewChatForm({
setLastSelectedCodexThinking,
])
+ // Clamp Claude thinking to levels the selected model supports.
+ const selectedClaudeThinking = useMemo(() => {
+ const supported = selectedModel?.thinkings ?? []
+ if (
+ supported.includes(lastSelectedClaudeThinking as ClaudeThinkingLevel)
+ ) {
+ return lastSelectedClaudeThinking as ClaudeThinkingLevel
+ }
+ if (supported.includes("high")) return "high"
+ return supported[0] ?? "off"
+ }, [selectedModel, lastSelectedClaudeThinking])
+
+ useEffect(() => {
+ const supported = selectedModel?.thinkings ?? []
+ if (
+ supported.length === 0 ||
+ supported.includes(lastSelectedClaudeThinking as ClaudeThinkingLevel)
+ ) {
+ return
+ }
+ setLastSelectedClaudeThinking(selectedClaudeThinking)
+ }, [
+ selectedModel,
+ lastSelectedClaudeThinking,
+ selectedClaudeThinking,
+ setLastSelectedClaudeThinking,
+ ])
+
const selectedChatModel = useMemo(() => {
if (selectedAgent.id === "codex") {
return `${selectedCodexModel.id}/${selectedCodexThinking}`
@@ -1386,7 +1415,7 @@ export function NewChatForm({
}
// For all other commands (builtin prompts and custom):
- // insert the command and let user add arguments or press Enter to send
+ // insert the command and let user add arguments or press Shift+Enter to send
editorRef.current?.setValue(`/${command.name} `)
},
[agentMode],
@@ -1905,8 +1934,8 @@ export function NewChatForm({
recommendedOllamaModel: availableModels.recommendedModel,
onSelectOllamaModel: setSelectedOllamaModel,
isConnected: isClaudeConnected,
- thinkingEnabled,
- onThinkingChange: setThinkingEnabled,
+ selectedThinking: selectedClaudeThinking,
+ onSelectThinking: setLastSelectedClaudeThinking,
}}
codex={{
models: codexUiModels,
diff --git a/src/renderer/features/agents/mentions/agents-mentions-editor.tsx b/src/renderer/features/agents/mentions/agents-mentions-editor.tsx
index 548334e42..8fa06f2a6 100644
--- a/src/renderer/features/agents/mentions/agents-mentions-editor.tsx
+++ b/src/renderer/features/agents/mentions/agents-mentions-editor.tsx
@@ -75,7 +75,7 @@ type AgentsMentionsEditorProps = {
placeholder?: string
className?: string
onSubmit?: () => void
- onForceSubmit?: () => void // Opt+Enter: bypass queue, stop stream and send immediately
+ onForceSubmit?: () => void // Opt+Shift+Enter: bypass queue, stop stream and send immediately
disabled?: boolean
onPaste?: (e: React.ClipboardEvent) => void
onShiftTab?: () => void // callback for Shift+Tab (e.g., mode switching)
@@ -1042,13 +1042,13 @@ export const AgentsMentionsEditor = memo(
}
// Prevent submission during IME composition (e.g., Chinese/Japanese/Korean input)
- if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
+ if (e.key === "Enter" && e.shiftKey && !e.nativeEvent.isComposing) {
if (triggerActive.current || slashTriggerActive.current) {
// Let dropdown handle Enter
return
}
e.preventDefault()
- // Opt+Enter = force submit (bypass queue, stop stream and send immediately)
+ // Opt+Shift+Enter = force submit (bypass queue, stop stream and send immediately)
if (e.altKey && onForceSubmit) {
onForceSubmit()
} else {
diff --git a/src/renderer/features/agents/ui/agent-context-indicator.tsx b/src/renderer/features/agents/ui/agent-context-indicator.tsx
index 06b837b00..a3860306b 100644
--- a/src/renderer/features/agents/ui/agent-context-indicator.tsx
+++ b/src/renderer/features/agents/ui/agent-context-indicator.tsx
@@ -11,6 +11,7 @@ import { cn } from "../../../lib/utils"
// Claude model context windows
const CONTEXT_WINDOWS = {
opus: 200_000,
+ "opus[1m]": 1_000_000,
sonnet: 200_000,
haiku: 200_000,
} as const
diff --git a/src/renderer/lib/atoms/index.ts b/src/renderer/lib/atoms/index.ts
index e28999953..edd3c91d4 100644
--- a/src/renderer/lib/atoms/index.ts
+++ b/src/renderer/lib/atoms/index.ts
@@ -359,16 +359,6 @@ export const activeConfigAtom = atom((get) => {
return undefined
})
-// Preferences - Extended Thinking
-// When enabled, Claude will use extended thinking for deeper reasoning (128K tokens)
-// Note: Extended thinking disables response streaming
-export const extendedThinkingEnabledAtom = atomWithStorage(
- "preferences:extended-thinking-enabled",
- true,
- undefined,
- { getOnInit: true },
-)
-
// Preferences - History (Rollback)
// When enabled, allow rollback to previous assistant messages
export const historyEnabledAtom = atomWithStorage(