From f335ce7204d07da23db9a3b6701381bb787c50fb Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Tue, 15 Apr 2025 14:59:30 -0700
Subject: [PATCH] fix gemini

---
 create-appimage.sh                            | 112 ------------------
 scripts/appimage/readme.md                    |  13 ++
 .../llmMessage/sendLLMMessage.impl.ts         |   8 +-
 3 files changed, 19 insertions(+), 114 deletions(-)
 delete mode 100644 create-appimage.sh

diff --git a/create-appimage.sh b/create-appimage.sh
deleted file mode 100644
index c79a351c..00000000
--- a/create-appimage.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-set -e  # Exit on error
-set -x  # Print commands as they are executed
-
-# Configuration
-APP_NAME="void"
-APP_VERSION="1.0.0"
-ARCH="x86_64"
-
-export ARCH
-
-# Check if void binary exists in current directory
-if [ ! -f "./void" ]; then
-    echo "Error: void binary not found in current directory"
-    exit 1
-fi
-
-# Check if icon exists
-if [ ! -f "./void.png" ]; then
-    echo "Error: void.png icon not found in current directory"
-    exit 1
-fi
-
-# Create temporary directory
-TEMP_DIR="$(mktemp -d)"
-echo "Created temporary directory: $TEMP_DIR"
-APP_DIR="$TEMP_DIR/$APP_NAME.AppDir"
-
-# Create basic AppDir structure
-mkdir -pv "$APP_DIR/usr/bin"
-mkdir -pv "$APP_DIR/usr/lib"
-mkdir -pv "$APP_DIR/usr/share/applications"
-mkdir -pv "$APP_DIR/usr/share/icons/hicolor/256x256/apps"
-
-# Exclude create-appimage.sh and appimagetool-x86_64.AppImage from being copied
-echo "Copying files excluding create-appimage.sh and appimagetool-x86_64.AppImage..."
-for file in ./*; do
-    if [[ "$file" != "./create-appimage.sh" && "$file" != "./appimagetool-x86_64.AppImage" ]]; then
-        cp -rv "$file" "$APP_DIR/usr/bin/"
-    fi
-done
-
-# Copy the icon to required locations
-cp -v ./void.png "$APP_DIR/void.png"
-cp -v ./void.png "$APP_DIR/usr/share/icons/hicolor/256x256/apps/void.png"
-
-# Copy dependencies with error checking
-echo "Copying dependencies..."
-for lib in $(ldd ./void | grep "=> /" | awk '{print $3}'); do
-    if [ -f "$lib" ]; then
-        cp -v "$lib" "$APP_DIR/usr/lib/" || echo "Failed to copy $lib"
-    else
-        echo "Warning: Library $lib not found"
-    fi
-done
-
-# Create desktop file with error checking
-echo "Creating desktop file..."
-if ! cat > "$APP_DIR/$APP_NAME.desktop" <<EOF
-[Desktop Entry]
-Name=$APP_NAME
-Exec=void
-Icon=void
-Type=Application
-Categories=Utility;
-Comment=Void Linux Application
-EOF
-then
-    echo "Error creating desktop file"
-    exit 1
-fi
-
-# Make desktop file executable
-chmod +x "$APP_DIR/$APP_NAME.desktop"
-
-# Copy the desktop file to the applications directory
-cp -v "$APP_DIR/$APP_NAME.desktop" "$APP_DIR/usr/share/applications/"
-
-# Create AppRun with error checking
-echo "Creating AppRun..."
-if ! cat > "$APP_DIR/AppRun" <<EOF
-#!/bin/bash
-cd "\$(dirname "\$0")/usr/bin"
-export LD_LIBRARY_PATH="\$APPDIR/usr/lib:\$LD_LIBRARY_PATH"
-exec ./void "\$@"
-EOF
-then
-    echo "Error creating AppRun"
-    exit 1
-fi
-
-# Make AppRun executable
-chmod +x "$APP_DIR/AppRun"
-
-# Download appimagetool if not present in the current directory
-if [ ! -f "./appimagetool-x86_64.AppImage" ]; then
-    echo "Downloading appimagetool-x86_64.AppImage..."
-    wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-    chmod +x appimagetool-x86_64.AppImage
-else
-    echo "appimagetool-x86_64.AppImage is already present."
-fi
-
-# Create the AppImage
-echo "Creating AppImage..."
-ARCH=x86_64 ./appimagetool-x86_64.AppImage "$APP_DIR" "${APP_NAME}-${APP_VERSION}-${ARCH}.AppImage"
-
-# Cleanup
-echo "Cleaning up..."
-rm -rf "$TEMP_DIR"
-
-echo "AppImage creation complete!"
diff --git a/scripts/appimage/readme.md b/scripts/appimage/readme.md
index fcb0260c..f31301a6 100644
--- a/scripts/appimage/readme.md
+++ b/scripts/appimage/readme.md
@@ -1,3 +1,16 @@
+
+
+# README
+
+This is a community-made AppImage creation script.
+
+There are some reported bugs with it.
+
+To generate an AppImage yourself, feel free to look at
+stable-linux.yml in the separate `void-builder/` repo,
+which runs a GitHub Action that builds the AppImage you see on our website.
+
+
 # Void AppImage Creation Script
 
 This script automates the process of creating an AppImage for the  Void Editor using Docker. It works on macOS and Linux platforms.
diff --git a/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts b/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts
index b3eec6ae..d613c62a 100644
--- a/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts
+++ b/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts
@@ -192,7 +192,9 @@ const _sendOpenAICompatibleChat = ({ messages, onText, onFinalMessage, onError,
 
 	// tools
 	const potentialTools = chatMode !== null ? openAITools(chatMode) : null
-	const nativeToolsObj = potentialTools ? { tools: potentialTools } as const : {}
+	const nativeToolsObj = potentialTools && specialToolFormat === 'openai-style' ?
+		{ tools: potentialTools } as const
+		: {}
 
 	// instance
 	const openai: OpenAI = newOpenAICompatibleSDK({ providerName, settingsOfProvider, includeInPayload })
@@ -374,7 +376,9 @@ const sendAnthropicChat = ({ messages, providerName, onText, onFinalMessage, onE
 
 	// tools
 	const potentialTools = chatMode !== null ? anthropicTools(chatMode) : null
-	const nativeToolsObj = potentialTools ? { tools: potentialTools, tool_choice: { type: 'auto' } } as const : {}
+	const nativeToolsObj = potentialTools && specialToolFormat === 'anthropic-style' ?
+		{ tools: potentialTools, tool_choice: { type: 'auto' } } as const
+		: {}
 
 
 	// instance