Added test cases.

Author: ethanyhou

com.microsoft.copilot.eclipse.swtbot.test/probe-scripts/chat-input-history-layout-001.json

@@ -0,0 +1,61 @@
+[
+  { "action": "waitForIdle" },
+  { "action": "screenshot", "id": "01-startup" },
+
+  { "action": "showView", "idRef": "com.microsoft.copilot.eclipse.ui.chat.ChatView" },
+  { "action": "waitForIdle" },
+  { "action": "screenshot", "id": "02-chat-open" },
+
+  { "action": "assertExists",
+    "locator": { "by": "viewId", "id": "com.microsoft.copilot.eclipse.ui.chat.ChatView" } },
+
+  { "action": "waitFor",
+    "locator": { "by": "widgetId", "value": "chat-input" },
+    "timeoutSec": 30 },
+
+  { "action": "waitForMethod",
+    "locator": { "by": "widgetId", "value": "model-picker" },
+    "method": "getSelectedItemId",
+    "timeoutSec": 60 },
+
+  { "action": "assertExists",
+    "locator": { "by": "widgetId", "value": "model-picker" } },
+  { "action": "assertExists",
+    "locator": { "by": "widgetId", "value": "mode-picker" } },
+  { "action": "screenshot", "id": "03-pickers-before" },
+
+  { "action": "click", "locator": { "by": "widgetId", "value": "chat-input" } },
+  { "action": "clearElement", "locator": { "by": "widgetId", "value": "chat-input" } },
+  { "action": "typeIn",
+    "locator": { "by": "widgetId", "value": "chat-input" },
+    "text": "Line 1 of a long message\nLine 2 of a long message\nLine 3 of a long message\nLine 4 of a long message\nLine 5 of a long message\nLine 6 of a long message\nLine 7 of a long message" },
+  { "action": "screenshot", "id": "04-long-message-typed" },
+
+  { "action": "waitFor",
+    "locator": { "by": "buttonWithTooltip", "tooltip": "Send" },
+    "timeoutSec": 30 },
+  { "action": "click",
+    "locator": { "by": "buttonWithTooltip", "tooltip": "Send" } },
+
+  { "action": "waitFor",
+    "locator": { "by": "widgetId", "value": "user-turn" },
+    "timeoutSec": 30 },
+  { "action": "waitFor",
+    "locator": { "by": "cssClass", "value": "model-info-label" },
+    "timeoutSec": 120 },
+  { "action": "screenshot", "id": "05-first-response" },
+
+  { "action": "click", "locator": { "by": "widgetId", "value": "chat-input" } },
+
+  { "action": "pressKey",
+    "key": "ARROW_UP",
+    "locator": { "by": "widgetId", "value": "chat-input" } },
+  { "action": "waitForIdle" },
+  { "action": "screenshot", "id": "06-after-history-recall" },
+
+  { "action": "assertExists",
+    "locator": { "by": "widgetId", "value": "model-picker" } },
+  { "action": "assertExists",
+    "locator": { "by": "widgetId", "value": "mode-picker" } },
+  { "action": "screenshot", "id": "07-pickers-after-history" }
+]

com.microsoft.copilot.eclipse.swtbot.test/src/com/microsoft/copilot/eclipse/swtbot/test/probe/StepExecutor.java

@@ -17,12 +17,13 @@
 import javax.imageio.ImageIO;
 
 import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
@@ -104,7 +105,7 @@ void execute(ProbeStep step, StepResult result) throws Exception {
         dumpUi(step, result);
         break;
       case "newSession":
-        invokeCommand("com.microsoft.copilot.eclipse.commands.newChatSession");
+        invokeCommand("com.microsoft.copilot.eclipse.commands.newConversation");
         break;
       default:
         throw new IllegalArgumentException("Unknown action: " + action);
@@ -205,41 +206,57 @@ private void waitForIdle() {
 
   private void pressKey(ProbeStep step) {
     String key = required(step.key, "key");
-    org.eclipse.jface.bindings.keys.KeyStroke stroke = toKeystroke(key);
+    int keyCode = toSwtKeyCode(key);
+    // Validate the locator resolves (guards against authoring errors).
+    // Focus management is the caller's responsibility via a preceding click action.
     if (step.locator != null) {
-      Object widget = resolve(step.locator);
-      if (widget instanceof SWTBotStyledText) {
-        ((SWTBotStyledText) widget).pressShortcut(stroke);
-        return;
-      }
-      if (widget instanceof SWTBotText) {
-        ((SWTBotText) widget).pressShortcut(stroke);
-        return;
-      }
-      // Fall through to shell-level press if the widget wrapper lacks pressShortcut.
+      resolve(step.locator);
     }
-    bot.activeShell().pressShortcut(stroke);
+    Display display = Display.getDefault();
+    display.syncExec(() -> postKey(display, keyCode));
+  }
+
+  private static void postKey(Display display, int keyCode) {
+    Event down = new Event();
+    down.type = SWT.KeyDown;
+    down.keyCode = keyCode;
+    display.post(down);
+    Event up = new Event();
+    up.type = SWT.KeyUp;
+    up.keyCode = keyCode;
+    display.post(up);
   }
 
-  private static org.eclipse.jface.bindings.keys.KeyStroke toKeystroke(String key) {
-    String upper = key.toUpperCase();
-    switch (upper) {
+  private static int toSwtKeyCode(String key) {
+    switch (key.toUpperCase()) {
       case "ENTER":
       case "RETURN":
       case "CR":
-        return Keystrokes.CR;
+        return SWT.CR;
       case "ESC":
       case "ESCAPE":
-        return Keystrokes.ESC;
+        return SWT.ESC;
       case "TAB":
-        return Keystrokes.TAB;
+        return SWT.TAB;
       case "SPACE":
-        return Keystrokes.SPACE;
+        return SWT.SPACE;
       case "BACKSPACE":
       case "BS":
-        return Keystrokes.BS;
+        return SWT.BS;
       case "DELETE":
-        return Keystrokes.DELETE;
+        return SWT.DEL;
+      case "UP":
+      case "ARROW_UP":
+        return SWT.ARROW_UP;
+      case "DOWN":
+      case "ARROW_DOWN":
+        return SWT.ARROW_DOWN;
+      case "LEFT":
+      case "ARROW_LEFT":
+        return SWT.ARROW_LEFT;
+      case "RIGHT":
+      case "ARROW_RIGHT":
+        return SWT.ARROW_RIGHT;
       default:
         throw new IllegalArgumentException("Unsupported key: " + key);
     }
@@ -369,6 +386,15 @@ private void click(ProbeStep step) {
       ((SWTBotText) widget).setFocus();
       return;
     }
+    if (widget instanceof org.eclipse.swt.custom.StyledText) {
+      org.eclipse.swt.custom.StyledText st = (org.eclipse.swt.custom.StyledText) widget;
+      Display.getDefault().syncExec(() -> {
+        if (!st.isDisposed()) {
+          st.setFocus();
+        }
+      });
+      return;
+    }
     invokeClick(widget);
   }
 
@@ -379,6 +405,13 @@ private void typeIn(ProbeStep step) {
       ((SWTBotText) widget).setText(payload);
     } else if (widget instanceof SWTBotStyledText) {
       ((SWTBotStyledText) widget).setText(payload);
+    } else if (widget instanceof org.eclipse.swt.custom.StyledText) {
+      org.eclipse.swt.custom.StyledText st = (org.eclipse.swt.custom.StyledText) widget;
+      Display.getDefault().syncExec(() -> {
+        if (!st.isDisposed()) {
+          st.setText(payload);
+        }
+      });
     } else {
       throw new IllegalArgumentException(
           "typeIn not supported for widget type: " + widget.getClass().getSimpleName());
@@ -391,6 +424,13 @@ private void clearElement(ProbeStep step) {
       ((SWTBotText) widget).setText("");
     } else if (widget instanceof SWTBotStyledText) {
       ((SWTBotStyledText) widget).setText("");
+    } else if (widget instanceof org.eclipse.swt.custom.StyledText) {
+      org.eclipse.swt.custom.StyledText st = (org.eclipse.swt.custom.StyledText) widget;
+      Display.getDefault().syncExec(() -> {
+        if (!st.isDisposed()) {
+          st.setText("");
+        }
+      });
     } else {
       throw new IllegalArgumentException(
           "clearElement not supported for widget type: " + widget.getClass().getSimpleName());

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ActionBar.java

@@ -216,6 +216,16 @@ public ActionBar(Composite parent, int style, ChatServiceManager chatServiceMana
 
     ChatInputTextViewer tv = new ChatInputTextViewer(borderedActionBar, chatServiceManager);
     tv.setEditable(true);
+    // Relayout the chat view container (this ActionBar's parent) when the input height changes
+    tv.setLayoutRefresher(() -> {
+      if (ActionBar.this.isDisposed()) {
+        return;
+      }
+      Composite chatViewParent = ActionBar.this.getParent();
+      if (chatViewParent != null && !chatViewParent.isDisposed()) {
+        chatViewParent.requestLayout();
+      }
+    });
     // Relayout the chat view container (this ActionBar's parent) when the input height changes,
     // so the bottom picker/action row remains visible even for tall inputs (e.g. long history recall).
     tv.setLayoutRefresher(() -> {
@@ -519,6 +529,7 @@ private void setUpChatModePicker(Composite parent) {
     this.modePickerButton.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false));
     this.modePickerButton.setToolTipText(Messages.chat_actionBar_modePicker_Tooltip);
     this.modePickerButton.setAccessibilityName("chat mode picker");
+    this.modePickerButton.setData("org.eclipse.swtbot.widget.key", "mode-picker");
     UserPreferenceService userPreferenceService = chatServiceManager.getUserPreferenceService();
     userPreferenceService.bindChatModePicker(this.modePickerButton);