From 1c9e6843506cb4e12550d3bcae56aa76ae120cf0 Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Mon, 5 May 2025 02:52:18 -0700
Subject: [PATCH] misc improvements

---
 .../contrib/void/browser/chatThreadService.ts |  1 -
 .../src/markdown/ApplyBlockHoverButtons.tsx   |  8 ++--
 .../react/src/markdown/ChatMarkdownRender.tsx |  4 +-
 .../react/src/sidebar-tsx/SidebarChat.tsx     |  2 +-
 .../react/src/void-settings-tsx/Settings.tsx  | 45 ++++++-------------
 .../contrib/void/common/modelCapabilities.ts  | 18 +++++---
 6 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/src/vs/workbench/contrib/void/browser/chatThreadService.ts b/src/vs/workbench/contrib/void/browser/chatThreadService.ts
index 82dfc7a3..7f8cc7af 100644
--- a/src/vs/workbench/contrib/void/browser/chatThreadService.ts
+++ b/src/vs/workbench/contrib/void/browser/chatThreadService.ts
@@ -726,7 +726,6 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 				const llmRes = await messageIsDonePromise // wait for message to complete
 				if (this.streamState[threadId]?.isRunning !== 'LLM') {
 					console.log('Unexpected chat agent state when', this.streamState[threadId]?.isRunning)
-					this._setStreamState(threadId, undefined)
 					return
 				}
 
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
index a668dbe7..2d397ecf 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
@@ -325,13 +325,13 @@ export const ApplyButtonsHTML = ({ codeStr, applyBoxId, uri }: { codeStr: string
 
 export const BlockCodeApplyWrapper = ({
 	children,
-	initValue,
+	codeStr,
 	applyBoxId,
 	language,
 	canApply,
 	uri,
 }: {
-	initValue: string;
+	codeStr: string;
 	children: React.ReactNode;
 	applyBoxId: string;
 	canApply: boolean;
@@ -364,8 +364,8 @@ export const BlockCodeApplyWrapper = ({
 			</div>
 			<div className={`${canApply ? '' : 'hidden'} flex items-center gap-1`}>
 				<JumpToFileButton uri={uri} />
-				{currStreamState === 'idle-no-changes' && <CopyButton codeStr={initValue} toolTipName='Copy' />}
-				<ApplyButtonsHTML uri={uri} applyBoxId={applyBoxId} codeStr={initValue} />
+				{currStreamState === 'idle-no-changes' && <CopyButton codeStr={codeStr} toolTipName='Copy' />}
+				<ApplyButtonsHTML uri={uri} applyBoxId={applyBoxId} codeStr={codeStr} />
 			</div>
 		</div>
 
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
index c7e972b8..96067725 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
@@ -319,12 +319,12 @@ const RenderToken = ({ token, inPTag, codeURI, chatMessageLocation, tokenIdx, ..
 			return <BlockCodeApplyWrapper
 				canApply={isCodeblockClosed}
 				applyBoxId={applyBoxId}
-				initValue={contents}
+				codeStr={contents}
 				language={language}
 				uri={uri || 'current'}
 			>
 				<BlockCode
-					initValue={contents}
+					initValue={contents.trimEnd()} // \n\n adds a permanent newline which creates a flash
 					language={language}
 				/>
 			</BlockCodeApplyWrapper>
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index 9e072e1f..dbb539f0 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -168,7 +168,7 @@ const ReasoningOptionSlider = ({ featureName }: { featureName: FeatureName }) =>
 		return <div className='flex items-center gap-x-2'>
 			<span className='text-void-fg-3 text-xs pointer-events-none inline-block w-10 pr-1'>Thinking</span>
 			<VoidSwitch
-				size='xs'
+				size='xxs'
 				value={isReasoningEnabled}
 				onChange={(newVal) => {
 					const isOff = canTurnOffReasoning && !newVal
diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
index 9341f61f..26237d9d 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
@@ -315,49 +315,32 @@ const SimpleModelSettingsDialog = ({
 					{type === 'default' ? `${modelName} comes packaged with Void, so you shouldn't need to change these settings.`
 						: isUnrecognizedModel
 							? `Model not recognized by Void.`
-							: `Void knows about this model ("${recognizedModelName}")!`}
+							: `Void recognizes ${modelName} ("${recognizedModelName}").`}
 				</div>
 
 
 				{/* override toggle */}
 				<div className="flex items-center gap-2 mb-4">
-					<VoidSwitch size='sm' value={overrideEnabled} onChange={setOverrideEnabled} />
-					<span className="text-void-fg-2">Override Model Defaults</span>
+					<VoidSwitch size='xs' value={overrideEnabled} onChange={setOverrideEnabled} />
+<span className="text-void-fg-3 text-sm">Override model defaults</span>
 				</div>
 
+				{/* Informational link */}
+				{overrideEnabled && <div className="text-sm text-void-fg-3 mb-4">
+					<ChatMarkdownRender string={"See the [sourcecode](https://github.com/voideditor/void/blob/cf0728f4c605bff49c34c923e15ae649f053d3e7/src/vs/workbench/contrib/void/common/modelCapabilities.ts#L142C1-L171C4) for a reference on how to set this JSON (advanced)."} chatMessageLocation={undefined} />
+				</div>}
 
-
-				{overrideEnabled ? (
-					<VoidInputBox2
-						multiline
-						className="w-full min-h-[200px] p-2 rounded-sm border border-void-border-2"
-						initValue={jsonText}
-						placeholder={placeholder}
-						onChangeText={setJsonText}
-					/>
-				) : (
-					<textarea
-						readOnly
-						className="w-full min-h-[200px] p-2 rounded-sm border border-void-border-2 bg-void-bg-2 text-void-fg-3 resize-none font-mono text-sm"
-						value={placeholder}
-						style={readOnlyHeight ? { height: readOnlyHeight } : undefined}
-						onLoad={(e) => {
-							// autosize height once
-							if (!readOnlyHeight) {
-								const h = (e.target as HTMLTextAreaElement).scrollHeight;
-								setReadOnlyHeight(h);
-							}
-						}}
-					/>
-				)}
+				<textarea
+					className={`w-full min-h-[200px] p-2 rounded-sm border border-void-border-2 bg-void-bg-2 resize-none font-mono text-sm ${!overrideEnabled ? 'text-void-fg-3' : ''}`}
+					value={overrideEnabled ? jsonText : placeholder}
+					placeholder={placeholder}
+					onChange={overrideEnabled ? (e) => setJsonText(e.target.value) : undefined}
+					readOnly={!overrideEnabled}
+				/>
 				{errorMsg && (
 					<div className="text-red-500 mt-2 text-sm">{errorMsg}</div>
 				)}
 
-				{/* Informational link */}
-				<div className="text-sm text-void-fg-3 mt-4">
-					<ChatMarkdownRender string={"For more information on what you can customize, see [this page](https://github.com/voideditor/void/blob/cf0728f4c605bff49c34c923e15ae649f053d3e7/src/vs/workbench/contrib/void/common/modelCapabilities.ts#L142C1-L171C4)."} chatMessageLocation={undefined} />
-				</div>
 
 				<div className="flex justify-end gap-2 mt-4">
 					<VoidButtonBgDarken onClick={onClose} className="px-3 py-1">
diff --git a/src/vs/workbench/contrib/void/common/modelCapabilities.ts b/src/vs/workbench/contrib/void/common/modelCapabilities.ts
index cd821bde..d1220f7a 100644
--- a/src/vs/workbench/contrib/void/common/modelCapabilities.ts
+++ b/src/vs/workbench/contrib/void/common/modelCapabilities.ts
@@ -487,7 +487,9 @@ const anthropicSettings: VoidStaticProviderInfo = {
 	providerReasoningIOSettings: {
 		input: {
 			includeInPayload: (reasoningInfo) => {
-				if (reasoningInfo?.type === 'budget_slider_value') {
+				if (!reasoningInfo?.isReasoningEnabled) return null
+
+				if (reasoningInfo.type === 'budget_slider_value') {
 					return { thinking: { type: 'enabled', budget_tokens: reasoningInfo.reasoningBudget } }
 				}
 				return null
@@ -626,7 +628,9 @@ const openAISettings: VoidStaticProviderInfo = {
 		input: {
 			// https://platform.openai.com/docs/guides/reasoning?api-mode=chat
 			includeInPayload: (reasoningInfo) => {
-				if (reasoningInfo?.type === 'effort_slider_value') {
+				if (!reasoningInfo?.isReasoningEnabled) return null
+
+				if (reasoningInfo.type === 'effort_slider_value') {
 					return { reasoning_effort: reasoningInfo.reasoningEffort }
 				}
 				return null
@@ -902,7 +906,9 @@ const groqSettings: VoidStaticProviderInfo = {
 	providerReasoningIOSettings: {
 		input: {
 			includeInPayload: (reasoningInfo) => {
-				if (reasoningInfo?.type === 'budget_slider_value') {
+				if (!reasoningInfo?.isReasoningEnabled) return null
+
+				if (reasoningInfo.type === 'budget_slider_value') {
 					return { reasoning_format: 'parsed' }
 				}
 				return null
@@ -1153,14 +1159,16 @@ const openRouterSettings: VoidStaticProviderInfo = {
 		input: {
 			// https://openrouter.ai/docs/use-cases/reasoning-tokens
 			includeInPayload: (reasoningInfo) => {
-				if (reasoningInfo?.type === 'budget_slider_value') {
+				if (!reasoningInfo?.isReasoningEnabled) return null
+
+				if (reasoningInfo.type === 'budget_slider_value') {
 					return {
 						reasoning: {
 							max_tokens: reasoningInfo.reasoningBudget
 						}
 					}
 				}
-				if (reasoningInfo?.type === 'effort_slider_value')
+				if (reasoningInfo.type === 'effort_slider_value')
 					return {
 						reasoning: {
 							effort: reasoningInfo.reasoningEffort