Merge branch 'staging' into sd-args

53635290685c3dc37f67d724385a72ef613741c9

Cohee <18619528+Cohee1207@users.noreply.github.com>

UpdateAndStart.bat+12 -3 Viewed

 pushd %~dp0
 git --version > nul 2>&1
 if %errorlevel% neq 0 (
-    echo Git is not installed on this system. Skipping update.
+    echo [91mGit is not installed on this system.[0m
-    echo If you installed with a zip file, you will need to download the new zip and install it manually.
+    echo Install it from https://git-scm.com/downloads
+    goto end
 ) else (
+    if not exist .git (
+        echo [91mNot running from a Git repository. Reinstall using an officially supported method to get updates.[0m
+        echo See: https://docs.sillytavern.app/installation/windows/
+        goto end
+    )
     call git pull --rebase --autostash
     if %errorlevel% neq 0 (
         REM incase there is still something wrong
-        echo There were errors while updating. Please download the latest version manually.
+        echo [91mThere were errors while updating.[0m
+        echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
+        goto end
+    )
+)
 set NODE_ENV=production
 call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
 node server.js %*
+:end
 pause
 popd

UpdateForkAndStart.bat+10 -3 Viewed

 echo Checking Git installation
 git --version > nul 2>&1
 if %errorlevel% neq 0 (
-    echo Git is not installed on this system. Skipping update.
+    echo [91mGit is not installed on this system.[0m
-    echo If you installed with a zip file, you will need to download the new zip and install it manually.
+    echo Install it from https://git-scm.com/downloads
+    goto end
+)
+if not exist .git (
+    echo [91mNot running from a Git repository. Reinstall using an officially supported method to get updates.[0m
+    echo See: https://docs.sillytavern.app/installation/windows/
     goto end
+)

 :install
 if %errorlevel% neq 0 (
-    echo There were errors while updating. Please check manually.
+    echo [91mThere were errors while updating.[0m
+    echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
     goto end
+)

public/scripts/instruct-mode.js+4 -0 Viewed

  * @returns {string} Formatted instruct mode system prompt.
  */
 export function formatInstructModeSystemPrompt(systemPrompt) {
+    if (!systemPrompt) {
+        return '';
+    }
     const separator = power_user.instruct.wrap ? '\n' : '';
     if (power_user.instruct.system_sequence_prefix) {

public/scripts/slash-commands.js+1 -1 Viewed

             resolve();
         } catch (error) {
             console.error('Error running /continue command:', error);
-            reject();
+            reject(error);
+        }
     });