ephemeral autoprunning now based on 5 "actual human written user turns"

priyanahata · priyanahata · commit ec17289553e5 · 2026-01-24T16:22:55.000+01:00
kill api request, and icons, highligting user feebdack
diff --git a/src/main/java/uno/anahata/ai/Chat.java b/src/main/java/uno/anahata/ai/Chat.java
@@ -88,13 +88,21 @@ public class Chat {
      */
     @Setter
     private boolean functionsEnabled = true;
+
+    /**
+     * Flag to enable or disable server-side tools (e.g., Google Search).
+     */
+    @Setter
+    private boolean serverToolsEnabled = false;
     
     private volatile boolean isProcessing = false;
     private volatile boolean shutdown = false;
     private Date startTime = new Date();
     
     private final AtomicLong messageCounter = new AtomicLong(0);
 
+    private volatile Thread processingThread;
+
     /**
      * Resets the sequential message counter to a specific value.
      * Useful when restoring a session from persistent storage.
@@ -131,11 +139,23 @@ public Chat(
     public void shutdown() {
         log.info("Shutting down Chat for session {}", config.getSessionId());
         this.shutdown = true;
+        kill();
         if (executor != null && !executor.isShutdown()) {
             executor.shutdown();
         }
     }
 
+    /**
+     * Interrupts the current processing thread, effectively cancelling any ongoing API call or tool execution.
+     */
+    public void kill() {
+        Thread t = processingThread;
+        if (t != null) {
+            log.info("Killing active processing thread: {}", t.getName());
+            t.interrupt();
+        }
+    }
+
     /**
      * Adds a listener to be notified of changes in the conversation context.
      *
@@ -203,12 +223,17 @@ public void sendText(String message) {
     }
     
     private ChatMessage buildChatMessage(Content content, GenerateContentResponseUsageMetadata usage, GroundingMetadata grounding) {
+        return buildChatMessage(content, usage, grounding, false);
+    }
+
+    private ChatMessage buildChatMessage(Content content, GenerateContentResponseUsageMetadata usage, GroundingMetadata grounding, boolean toolFeedback) {
         return ChatMessage.builder()
             .sequentialId(messageCounter.incrementAndGet())
             .modelId(config.getApi().getModelId())
             .content(content)
             .usageMetadata(usage)
             .groundingMetadata(grounding)
+            .toolFeedback(toolFeedback)
             .build();
     }
 
@@ -223,6 +248,7 @@ public void sendContent(Content content) {
             return;
         }
         isProcessing = true;
+        processingThread = Thread.currentThread();
         statusManager.recordUserInputTime();
         statusManager.setStatus(ChatStatus.API_CALL_IN_PROGRESS);
         try {
@@ -231,12 +257,17 @@ public void sendContent(Content content) {
 
             processModelResponseLoop();
         } catch (Exception e) {
-            log.error("An unhandled exception occurred during the processing loop.", e);
+            if (Thread.interrupted() || e.getCause() instanceof InterruptedException) {
+                log.info("Processing loop interrupted/killed.");
+            } else {
+                log.error("An unhandled exception occurred during the processing loop.", e);
+            }
             // If an exception bubbles all the way up, it's a critical failure.
             // The MAX_RETRIES_REACHED status would have already been set inside the loop.
             // We don't want the finally block to override it.
         } finally {
             isProcessing = false;
+            processingThread = null;
             // Only reset to IDLE if we are not in a terminal error state.
             if (statusManager.getCurrentStatus() != ChatStatus.MAX_RETRIES_REACHED) {
                 statusManager.setStatus(ChatStatus.IDLE_WAITING_FOR_USER);
@@ -246,14 +277,18 @@ public void sendContent(Content content) {
 
     private void processModelResponseLoop() {
         while (true) {
-            if (shutdown) {
-                log.info("Shutdown flag detected. Breaking processing loop for session {}.", config.getSessionId());
+            if (shutdown || Thread.interrupted()) {
+                log.info("Shutdown or interrupt flag detected. Breaking processing loop for session {}.", config.getSessionId());
                 break;
             }
 
             List<Content> apiContext = buildApiContext(contextManager.getContext());
             GenerateContentResponse resp = sendToModelWithRetry(apiContext);
 
+            if (resp == null) {
+                break; // Interrupted
+            }
+
             if (resp.candidates() == null || !resp.candidates().isPresent() || resp.candidates().get().isEmpty()) {
                 log.warn("Received response with no candidates. Possibly due to safety filters. Breaking loop.");
                 Content emptyContent = Content.builder().role("model").parts(Part.fromText("[No response from model]")).build();
@@ -302,7 +337,7 @@ private boolean processAndReloopForFunctionCalls(ChatMessage modelMessageWithCal
             String feedbackText = "User Feedback: " + feedback;
             
             Content feedbackContent = Content.builder().role("user").parts(Part.fromText(feedbackText)).build();
-            ChatMessage feedbackMessage = buildChatMessage(feedbackContent, null, null);
+            ChatMessage feedbackMessage = buildChatMessage(feedbackContent, null, null, true);
             contextManager.add(feedbackMessage);
             return false;
         }
@@ -367,7 +402,7 @@ private boolean processAndReloopForFunctionCalls(ChatMessage modelMessageWithCal
             userFeedbackParts.addAll(extraUserParts);
 
             Content feedbackContent = Content.builder().role("user").parts(userFeedbackParts).build();
-            ChatMessage feedbackMessage = buildChatMessage(feedbackContent, null, null);
+            ChatMessage feedbackMessage = buildChatMessage(feedbackContent, null, null, true);
             feedbackMessage.setDependencies(userFeedbackDependencies); // Set dependencies after creation
             messagesToAdd.add(feedbackMessage);
         }
@@ -386,6 +421,9 @@ private GenerateContentResponse sendToModelWithRetry(List<Content> context) {
         long backoffAmount = 0;
 
         for (int attempt = 0; attempt < maxRetries; attempt++) {
+            if (Thread.interrupted()) {
+                return null;
+            }
             Client client = getGoogleGenAIClient();
             try {
                 statusManager.setStatus(ChatStatus.API_CALL_IN_PROGRESS);
@@ -427,6 +465,9 @@ private GenerateContentResponse sendToModelWithRetry(List<Content> context) {
                 
                 return ret;
             } catch (Exception e) {
+                if (Thread.interrupted() || e.getCause() instanceof InterruptedException) {
+                    return null;
+                }
                 log.warn("Api Error on attempt {}: {}", attempt, e.toString());
                 String apiKey = client.apiKey();
                 String apiKeyLast5 = StringUtils.right(apiKey, 5);
@@ -446,7 +487,7 @@ private GenerateContentResponse sendToModelWithRetry(List<Content> context) {
                         Thread.sleep(backoffAmount);
                     } catch (InterruptedException ie) {
                         Thread.currentThread().interrupt();
-                        throw new RuntimeException("Chat was interrupted during retry delay.", ie);
+                        return null;
                     }
                 } else {
                     log.error("Unknown error from Google's servers", e);
diff --git a/src/main/java/uno/anahata/ai/ChatMessage.java b/src/main/java/uno/anahata/ai/ChatMessage.java
@@ -83,6 +83,13 @@ public class ChatMessage {
     @Builder.Default
     private final Instant createdOn = Instant.now();
 
+    /**
+     * Indicates if this message is a system-generated tool feedback message.
+     * Tool feedback messages have the 'user' role but should not be counted
+     * as actual user turns for pruning purposes.
+     */
+    private final boolean toolFeedback;
+
     /**
      * Performs a full graph traversal to find all parts connected to the startPart,
      * including the startPart itself. This is used to find the complete set of
@@ -153,4 +160,4 @@ public void addDependencies(Part sourcePart, List<Part> dependentParts) {
         log.info("Added {} new dependencies to source part {} in message {}. Total dependencies for part: {}",
                 dependentParts.size(), sourcePart.functionCall().map(fc -> fc.name().orElse("Text/Blob")).orElse("Text/Blob"), sequentialId, existing.size());
     }
-}
+}
diff --git a/src/main/java/uno/anahata/ai/config/ConfigManager.java b/src/main/java/uno/anahata/ai/config/ConfigManager.java
@@ -73,7 +73,7 @@ public GenerateContentConfig makeGenerateContentConfig() {
             builder
                     .tools(chat.getToolManager().getFunctionTool())
                     .toolConfig(chat.getToolManager().getToolConfig());
-        } else {
+        } else if (chat.isServerToolsEnabled()) {
             Tool googleTools = Tool.builder().googleSearch(GoogleSearch.builder().build()).build();
             builder.tools(googleTools);
         }
diff --git a/src/main/java/uno/anahata/ai/context/provider/spi/ChatStatusProvider.java b/src/main/java/uno/anahata/ai/context/provider/spi/ChatStatusProvider.java
@@ -46,7 +46,7 @@ public List<Part> getParts(Chat chat) {
         chatStatusBlock.append("- StatusManager: ").append(chat.getStatusManager()).append("\n");
         chatStatusBlock.append("- Session Start time: ").append(chat.getStartTime()).append("\n");
         //chatStatusBlock.append("- Live Workspace (auto attaches screen captures on every call) Enabled: ").append(chat.isLiveWorkspaceEnabled()).append("\n");        
-        chatStatusBlock.append("- Server Side Tools (like google search) Enabled: ").append(!chat.isFunctionsEnabled()).append("\n");
+        chatStatusBlock.append("- Server Side Tools (like google search) Enabled: ").append(chat.isServerToolsEnabled()).append("\n");
         chatStatusBlock.append("- Local @AiToolMethod Tools (e.g. LocalFiles) Enabled: ").append(chat.isFunctionsEnabled()).append("\n");
         if (chat.getLatency() > 0) {
             chatStatusBlock.append("- Latency (last successfull user/model round trip): ").append(chat.getLatency()).append(" ms.\n");
diff --git a/src/main/java/uno/anahata/ai/context/pruning/ContextPruner.java b/src/main/java/uno/anahata/ai/context/pruning/ContextPruner.java
@@ -415,20 +415,20 @@ public void pruneEphemeralToolCalls(ToolManager toolManager) {
         }
         List<ChatMessage> context = contextManager.getContext();
 
-        // Find the index of the message that marks our cutoff point (2 user turns ago).
-        List<Integer> userMessageIndices = new ArrayList<>();
+        // Find the index of the message that marks our cutoff point (5 user turns ago).
+        List<Integer> userTurnIndices = new ArrayList<>();
         for (int i = context.size() - 1; i >= 0; i--) {
-            if (isUserMessage(context.get(i))) {
-                userMessageIndices.add(i);
+            if (isUserTurn(context.get(i))) {
+                userTurnIndices.add(i);
             }
         }
 
         // If there aren't enough user turns yet, there's nothing to prune.
-        if (userMessageIndices.size() <= turnsToKeep) {
-            log.info("Not enough user turns ({} <= {}). Aborting ephemeral pruning.", userMessageIndices.size(), turnsToKeep);
+        if (userTurnIndices.size() <= turnsToKeep) {
+            log.info("Not enough user turns ({} <= {}). Aborting ephemeral pruning.", userTurnIndices.size(), turnsToKeep);
             return;
         }
-        int pruneCutoffIndex = userMessageIndices.get(turnsToKeep);
+        int pruneCutoffIndex = userTurnIndices.get(turnsToKeep);
         log.info("Pruning cutoff index determined: {}. Messages older than this index will be scanned.", pruneCutoffIndex);
 
         // === Phase 1: Comprehensive Context Scan ===
@@ -525,9 +525,11 @@ private boolean isFailedStatefulResponse(FunctionResponse fr, ToolManager toolMa
     }
 
     /**
-     * Helper to determine if a message is a user message.
+     * Helper to determine if a message is an actual user turn (not system-generated feedback).
      */
-    private boolean isUserMessage(ChatMessage message) {
-        return message.getContent() != null && "user".equals(message.getContent().role().orElse(null));
+    private boolean isUserTurn(ChatMessage message) {
+        return message.getContent() != null 
+                && "user".equals(message.getContent().role().orElse(null))
+                && !message.isToolFeedback();
     }
 }
diff --git a/src/main/java/uno/anahata/ai/status/ChatStatus.java b/src/main/java/uno/anahata/ai/status/ChatStatus.java
@@ -35,6 +35,14 @@ public enum ChatStatus {
         this.description = description;
     }
 
+    /**
+     * Checks if the current status represents a state that can be interrupted by the user.
+     * @return true if interruptible, false otherwise.
+     */
+    public boolean isInterruptible() {
+        return this == API_CALL_IN_PROGRESS || this == WAITING_WITH_BACKOFF || this == TOOL_EXECUTION_IN_PROGRESS;
+    }
+
     @Override
     public String toString() {
         return displayName;
diff --git a/src/main/java/uno/anahata/ai/swing/ChatPanel.java b/src/main/java/uno/anahata/ai/swing/ChatPanel.java
@@ -39,7 +39,8 @@ public class ChatPanel extends JPanel implements ContextListener, StatusListener
     private JToggleButton liveWorkspaceButton;
     private JButton saveSessionButton;
     private JButton loadSessionButton;
-    private JToggleButton functionsButton;
+    private JToggleButton localToolsButton;
+    private JToggleButton serverToolsButton;
     private JComboBox<String> modelIdComboBox;
 
     private final EditorKitProvider editorKitProvider;
@@ -98,9 +99,27 @@ private void initComponents() {
         clearButton.setToolTipText("Restart Chat");
         clearButton.addActionListener(e -> restartChat());
 
-        functionsButton = new JToggleButton(IconUtils.getIcon("functions.png"), true);
-        functionsButton.setToolTipText("Enable / Disable Functions");
-        functionsButton.addActionListener(e -> chat.setFunctionsEnabled(functionsButton.isSelected()));
+        localToolsButton = new JToggleButton(IconUtils.getIcon("java.png"), chat.isFunctionsEnabled());
+        localToolsButton.setToolTipText("Enable / Disable Local Tools (Java)");
+        localToolsButton.addActionListener(e -> {
+            boolean selected = localToolsButton.isSelected();
+            chat.setFunctionsEnabled(selected);
+            if (selected) {
+                serverToolsButton.setSelected(false);
+                chat.setServerToolsEnabled(false);
+            }
+        });
+
+        serverToolsButton = new JToggleButton(IconUtils.getIcon("google.png", 18), chat.isServerToolsEnabled());
+        serverToolsButton.setToolTipText("Enable / Disable Server Tools (Google Search)");
+        serverToolsButton.addActionListener(e -> {
+            boolean selected = serverToolsButton.isSelected();
+            chat.setServerToolsEnabled(selected);
+            if (selected) {
+                localToolsButton.setSelected(false);
+                chat.setFunctionsEnabled(false);
+            }
+        });
 
         liveWorkspaceButton = new JToggleButton(IconUtils.getIcon("compress.png"), true);
         liveWorkspaceButton.setToolTipText("Toggle Live Workspace View");
@@ -129,7 +148,8 @@ private void initComponents() {
         loadSessionButton.addActionListener(e -> loadSession());
 
         toolbar.add(clearButton);
-        toolbar.add(functionsButton);
+        toolbar.add(localToolsButton);
+        toolbar.add(serverToolsButton);
         toolbar.add(liveWorkspaceButton);
         toolbar.add(new JToolBar.Separator());
         toolbar.add(saveSessionButton);
diff --git a/src/main/java/uno/anahata/ai/swing/IconUtils.java b/src/main/java/uno/anahata/ai/swing/IconUtils.java
@@ -17,13 +17,24 @@ public class IconUtils {
      * @return A scaled ImageIcon, or null if the resource is not found.
      */
     public static ImageIcon getIcon(String name) {
+        return getIcon(name, 24);
+    }
+
+    /**
+     * Loads an icon from the classpath resources and scales it to the specified size.
+     *
+     * @param name The name of the icon file.
+     * @param size The size (width and height) to scale the icon to.
+     * @return A scaled ImageIcon, or null if the resource is not found.
+     */
+    public static ImageIcon getIcon(String name, int size) {
         try {
             URL resource = IconUtils.class.getResource("/icons/" + name);
             if (resource == null) {
                 return null;
             }
             ImageIcon originalIcon = new ImageIcon(resource);
-            Image scaledImage = originalIcon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH);
+            Image scaledImage = originalIcon.getImage().getScaledInstance(size, size, Image.SCALE_SMOOTH);
             return new ImageIcon(scaledImage);
         } catch (Exception e) {
             return null;
diff --git a/src/main/java/uno/anahata/ai/swing/StatusPanel.java b/src/main/java/uno/anahata/ai/swing/StatusPanel.java
@@ -14,6 +14,7 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -41,6 +42,7 @@ public class StatusPanel extends JPanel {
     private JPanel detailsPanel;
     private JLabel tokenDetailsLabel;
     private JToggleButton soundToggle;
+    private JButton killButton;
 
     public StatusPanel(ChatPanel parentPanel) {
         super(new BorderLayout(10, 2));
@@ -77,9 +79,15 @@ private void initComponents() {
         soundToggle.setSelected(!parentPanel.getConfig().isAudioFeedbackEnabled());
         soundToggle.addActionListener(e -> parentPanel.getConfig().setAudioFeedbackEnabled(!soundToggle.isSelected()));
 
+        killButton = new JButton(IconUtils.getIcon("kill.png", 16));
+        killButton.setToolTipText("Interrupt current API request or tool execution");
+        killButton.setVisible(false);
+        killButton.addActionListener(e -> parentPanel.getChat().kill());
+
         statusDisplayPanel.add(soundToggle);
         statusDisplayPanel.add(statusIndicator);
         statusDisplayPanel.add(statusLabel);
+        statusDisplayPanel.add(killButton);
         
         contextUsageBar = new ContextUsageBar(parentPanel);
         
@@ -136,6 +144,9 @@ public void refresh() {
             }
         }
 
+        // Update Kill Button visibility
+        killButton.setVisible(currentStatus.isInterruptible());
+
         // 2. Refresh Context Usage Bar
         contextUsageBar.refresh();
 
diff --git a/src/main/java/uno/anahata/ai/tools/ToolCallOutcome.java b/src/main/java/uno/anahata/ai/tools/ToolCallOutcome.java
@@ -67,7 +67,7 @@ public String toFeedbackString(boolean dialogShown) {
         StringBuilder sb = new StringBuilder();
         sb.append("[").append(toolName).append(" id=").append(id).append(" ").append(statusLabel);
         if (StringUtils.isNotBlank(executionFeedback)) {
-            sb.append(" User Feedback: '").append(executionFeedback).append("'");
+            sb.append(" User Feedback: **'").append(executionFeedback).append("'**");
         }
         sb.append("]");
         return sb.toString();
diff --git a/src/main/java/uno/anahata/ai/tools/ToolManager.java b/src/main/java/uno/anahata/ai/tools/ToolManager.java
@@ -425,7 +425,7 @@ private String generateFeedbackMessage(List<ToolCallOutcome> outcomes, String us
         
         // 1. Popup Comment (Highest priority for the model to see)
         if (dialogShown && StringUtils.isNotBlank(userComment)) {
-            feedbackText.append("Tool confirmation popup comment: '").append(userComment).append("'\n\n");
+            feedbackText.append("Tool confirmation popup comment: **'").append(userComment).append("'**\n\n");
         }
 
         // 2. Tool Feedback (The core outcomes)
diff --git a/src/main/resources/icons/google.png b/src/main/resources/icons/google.png
diff --git a/src/main/resources/icons/java.png b/src/main/resources/icons/java.png
diff --git a/src/main/resources/icons/kill.png b/src/main/resources/icons/kill.png

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public GenerateContentConfig makeGenerateContentConfig() {`
`73`	`73`	`builder`
`74`	`74`	`.tools(chat.getToolManager().getFunctionTool())`
`75`	`75`	`.toolConfig(chat.getToolManager().getToolConfig());`
`76`		`- } else {`
	`76`	`+ } else if (chat.isServerToolsEnabled()) {`
`77`	`77`	`Tool googleTools = Tool.builder().googleSearch(GoogleSearch.builder().build()).build();`
`78`	`78`	`builder.tools(googleTools);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -415,20 +415,20 @@ public void pruneEphemeralToolCalls(ToolManager toolManager) {`
`415`	`415`	`}`
`416`	`416`	`List<ChatMessage> context = contextManager.getContext();`
`417`	`417`
`418`		`- // Find the index of the message that marks our cutoff point (2 user turns ago).`
`419`		`- List<Integer> userMessageIndices = new ArrayList<>();`
	`418`	`+ // Find the index of the message that marks our cutoff point (5 user turns ago).`
	`419`	`+ List<Integer> userTurnIndices = new ArrayList<>();`
`420`	`420`	`for (int i = context.size() - 1; i >= 0; i--) {`
`421`		`- if (isUserMessage(context.get(i))) {`
`422`		`- userMessageIndices.add(i);`
	`421`	`+ if (isUserTurn(context.get(i))) {`
	`422`	`+ userTurnIndices.add(i);`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`// If there aren't enough user turns yet, there's nothing to prune.`
`427`		`- if (userMessageIndices.size() <= turnsToKeep) {`
`428`		`- log.info("Not enough user turns ({} <= {}). Aborting ephemeral pruning.", userMessageIndices.size(), turnsToKeep);`
	`427`	`+ if (userTurnIndices.size() <= turnsToKeep) {`
	`428`	`+ log.info("Not enough user turns ({} <= {}). Aborting ephemeral pruning.", userTurnIndices.size(), turnsToKeep);`
`429`	`429`	`return;`
`430`	`430`	`}`
`431`		`- int pruneCutoffIndex = userMessageIndices.get(turnsToKeep);`
	`431`	`+ int pruneCutoffIndex = userTurnIndices.get(turnsToKeep);`
`432`	`432`	`log.info("Pruning cutoff index determined: {}. Messages older than this index will be scanned.", pruneCutoffIndex);`
`433`	`433`
`434`	`434`	`// === Phase 1: Comprehensive Context Scan ===`
`@@ -525,9 +525,11 @@ private boolean isFailedStatefulResponse(FunctionResponse fr, ToolManager toolMa`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`/**`
`528`		`- * Helper to determine if a message is a user message.`
	`528`	`+ * Helper to determine if a message is an actual user turn (not system-generated feedback).`
`529`	`529`	`*/`
`530`		`- private boolean isUserMessage(ChatMessage message) {`
`531`		`- return message.getContent() != null && "user".equals(message.getContent().role().orElse(null));`
	`530`	`+ private boolean isUserTurn(ChatMessage message) {`
	`531`	`+ return message.getContent() != null`
	`532`	`+ && "user".equals(message.getContent().role().orElse(null))`
	`533`	`+ && !message.isToolFeedback();`
`532`	`534`	`}`
`533`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public String toFeedbackString(boolean dialogShown) {`
`67`	`67`	`StringBuilder sb = new StringBuilder();`
`68`	`68`	`sb.append("[").append(toolName).append(" id=").append(id).append(" ").append(statusLabel);`
`69`	`69`	`if (StringUtils.isNotBlank(executionFeedback)) {`
`70`		`- sb.append(" User Feedback: '").append(executionFeedback).append("'");`
	`70`	`+ sb.append(" User Feedback: '").append(executionFeedback).append("'");`
`71`	`71`	`}`
`72`	`72`	`sb.append("]");`
`73`	`73`	`return sb.toString();`