Arm keepalive for regenerated responses

345ef5f3a92198f55aac8e36c9303c1744a8b044

permissionBRICK <40219477+permissionBRICK@users.noreply.github.com>

Parents: d4a0852ee81d3a22b6339426124c3783e2c37481

public/scripts/extensions/keepalive/index.js+15 -12 Viewed

 let preparingJob = false;
 let lifecycleVersion = 0;
 // Whether keepalive is "armed" for the CURRENT chat. It stays dormant until the user sends a new
-// message in the open chat — on a freshly loaded or switched-to chat (even with history already
+// message or starts another foreground generation in the open chat. Merely loading a chat does not
-// present) we have no way to know whether its prompt is still cached server-side, so pinging would
+// prove that its prompt is cached server-side. Reset on page reload and whenever the chat changes.
-// be pointless. Reset on page reload and whenever the chat changes.
 let armed = false;
 // Per-profile "time since last message", keyed by connection profile id (or NONE_KEY).
 // In-memory only: on reload every profile is treated as freshly active.

+}
 /**
- * The user sent a new message in the current chat — the ONLY thing that arms keepalive.
+ * A new user message arms keepalive before its foreground generation begins.
- * Background/quiet generations, swipes, regenerations, and loading chat history deliberately do
- * NOT arm it: none of those prove the user is actively continuing THIS chat from a known-cached
- * prompt (GENERATION_STARTED in particular fires for every quiet/background generation too).
  */
 function onMessageSent() {
     armed = true;

 /**
  * Opening or switching chats disarms keepalive: a freshly loaded chat is not proof its prompt is
- * still cached server-side, so we wait for a new sent message in that chat before running again.
+ * still cached server-side, so we wait for a new message or foreground generation before running.
  */
 function onChatChanged() {
     armed = false;

@@ -454,10 +450,16 @@ function setupListeners() {
454	});	450	});
455	}	451	}
456		452
457	function onGenerationStarted(_type, _options, dryRun) {	453	function onGenerationStarted(type, _options, dryRun) {
458	if (!dryRun) {	454	if (dryRun) {
459	markActivity();	455	return;
460	}	456	}
		457	// Regenerates, swipes, and continues send the current prompt to the provider without emitting
		458	// MESSAGE_SENT. They are just as valid proof of a warm prompt as a newly typed message.
		459	if (type !== 'quiet') {
		460	armed = true;
		461	}
		462	markActivity();
461	}	463	}
462		464
463	function onGenerationEnded() {	465	function onGenerationEnded() {

     setupListeners();
     setupHeartbeatLoop();
-    // Only the user sending a new message arms keepalive (for the current chat).
+    // A new user message arms keepalive before generation starts. Foreground generations that do
+    // not send a new message (regenerate/swipe/continue) are armed by onGenerationStarted instead.
     eventSource.on(event_types.MESSAGE_SENT, onMessageSent);
     // Activity resets the backend deadline but never arms keepalive on its own. A completed

public/scripts/extensions/keepalive/manifest.json+1 -1 Viewed

     "js": "index.js",
     "css": "",
     "author": "SillyTavern",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "homePage": "https://github.com/SillyTavern/SillyTavern",
     "hooks": {
         "activate": "init"

public/scripts/extensions/keepalive/settings.html+1 -1 Viewed

             <label for="keepalive_message" data-i18n="ext_keepalive_message">Keepalive message</label>
             <input id="keepalive_message" class="text_pole" type="text" />
-            <small data-i18n="ext_keepalive_help">After this many seconds without activity on the active connection profile, the current chat plus this message (sent as a hidden user message) is submitted to that profile to keep its server-side prompt cache warm. The completion is capped to a single token and is never saved to the chat. The server owns the keepalive timer, while this tab renews its lease every 20 seconds; if the tab sleeps or closes, the server continues on schedule for up to five minutes after the last heartbeat. Only the profile you're currently using is pinged. Keepalive stays off until you send a new message in the current chat (opening, switching to, or reloading a chat isn't proof its prompt is still cached).</small>
+            <small data-i18n="ext_keepalive_help">After this many seconds without activity on the active connection profile, the current chat plus this message (sent as a hidden user message) is submitted to that profile to keep its server-side prompt cache warm. The completion is capped to a single token and is never saved to the chat. The server owns the keepalive timer, while this tab renews its lease every 20 seconds; if the tab sleeps or closes, the server continues on schedule for up to five minutes after the last heartbeat. Only the profile you're currently using is pinged. Keepalive stays off until you send a message or start a foreground generation (including regenerate, swipe, or continue); merely opening, switching to, or reloading a chat is not proof its prompt is cached.</small>
             <hr>