fix - Terminal integration issues (#1145)

* fix the bug Not properly disposed SWT resource.
* fix the bug that failed to install terminal bundle.

Author: xinyi-gong

com.microsoft.copilot.eclipse.terminal.api/src/com/microsoft/copilot/eclipse/terminal/api/IRunInTerminalTool.java

@@ -3,7 +3,8 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
+
 
 /**
  * Interface for terminal tool implementations that can execute commands in a terminal. This interface is used by the
@@ -38,7 +39,7 @@ public interface IRunInTerminalTool {
   public StringBuilder getBackgroundCommandOutput(String executionId);
 
   /**
-   * Sets the terminal icon for the tool.
+   * Sets the terminal icon descriptor for the tool.
    */
-  public void setTerminalIcon(Image terminalIcon);
+  public void setTerminalIconDescriptor(ImageDescriptor terminalIconDescriptor);
 }

com.microsoft.copilot.eclipse.terminal.api/src/com/microsoft/copilot/eclipse/terminal/api/TerminalServiceManager.java

@@ -249,7 +249,15 @@ private IStatus installAndRefreshBundle(String bundleLocation, IProgressMonitor
     }
     monitor.worked(20);
     monitor.subTask("Installing bundle");
-    Bundle installedBundle = bundleContext.installBundle(bundleLocation);
+    Bundle installedBundle;
+    try {
+      installedBundle = bundleContext.installBundle(bundleLocation);
+    } catch (Exception e) {
+      CopilotCore.LOGGER.error("Failed to install terminal bundle from location: " + bundleLocation, e);
+      monitor.done();
+      return new Status(IStatus.ERROR, bundleContext.getBundle().getSymbolicName(),
+          "Failed to install terminal bundle: " + e.getMessage(), e);
+    }
     Set<Bundle> bundlesToStart = new HashSet<>();
     Set<Bundle> toRefresh = new HashSet<>();
     bundlesToStart.add(installedBundle);
@@ -327,7 +335,7 @@ private URL getBundleResourceUrl(String bundleJarName) {
         if ("com.microsoft.copilot.eclipse.ui".equals(bundle.getSymbolicName())) {
           URL bundleUrl = FileLocator.find(bundle, new Path(TERMINAL_BUNDLES_PATH + bundleJarName));
           if (bundleUrl != null) {
-            return FileLocator.resolve(bundleUrl);
+            return FileLocator.toFileURL(bundleUrl);
           }
         }
       }

com.microsoft.copilot.eclipse.ui.terminal.tm/src/com/microsoft/copilot/eclipse/ui/terminal/tm/RunInTerminalTool.java

@@ -8,6 +8,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.DisposeListener;
@@ -50,6 +51,7 @@ public class RunInTerminalTool implements IRunInTerminalTool {
   private CTabFolder tabFolder;
   private CTabItem copilotTabItem;
   private Image terminalIcon;
+  private ImageDescriptor terminalIconDescriptor;
 
   // Output and command state
   private StringBuilder sb;
@@ -185,7 +187,10 @@ private ITerminalControl getTerminalControl(String terminalTitle, boolean isBack
             if (tabFolder != null) {
               for (CTabItem item : tabFolder.getItems()) {
                 if (terminalTitle.equals(item.getText())) {
-                  if (terminalIcon != null) {
+                  if (terminalIconDescriptor != null) {
+                    if (terminalIcon == null || terminalIcon.isDisposed()) {
+                      terminalIcon = terminalIconDescriptor.createImage();
+                    }
                     item.setImage(terminalIcon);
                   }
                   item.addDisposeListener(
@@ -321,7 +326,7 @@ private IWorkbenchPage getActivePage() {
   }
 
   @Override
-  public void setTerminalIcon(Image terminalIcon) {
-    this.terminalIcon = terminalIcon;
+  public void setTerminalIconDescriptor(ImageDescriptor iconDescriptor) {
+    this.terminalIconDescriptor = iconDescriptor;
   }
 }

com.microsoft.copilot.eclipse.ui.terminal/src/com/microsoft/copilot/eclipse/ui/terminal/RunInTerminalTool.java

@@ -8,6 +8,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.DisposeListener;
@@ -50,6 +51,7 @@ public class RunInTerminalTool implements IRunInTerminalTool {
   private CTabFolder tabFolder;
   private CTabItem copilotTabItem;
   private Image terminalIcon;
+  private ImageDescriptor terminalIconDescriptor;
 
   // Output and command state
   private StringBuilder sb;
@@ -186,7 +188,10 @@ private ITerminalControl getTerminalControl(String terminalTitle, boolean isBack
             if (tabFolder != null) {
               for (CTabItem item : tabFolder.getItems()) {
                 if (terminalTitle.equals(item.getText())) {
-                  if (terminalIcon != null) {
+                  if (terminalIconDescriptor != null) {
+                    if (terminalIcon == null || terminalIcon.isDisposed()) {
+                      terminalIcon = terminalIconDescriptor.createImage();
+                    }
                     item.setImage(terminalIcon);
                   }
                   item.addDisposeListener(
@@ -321,8 +326,9 @@ private IWorkbenchPage getActivePage() {
     return null;
   }
 
+
   @Override
-  public void setTerminalIcon(Image terminalIcon) {
-    this.terminalIcon = terminalIcon;
+  public void setTerminalIconDescriptor(ImageDescriptor iconDescriptor) {
+    this.terminalIconDescriptor = iconDescriptor;
   }
 }

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/tools/RunInTerminalToolAdapter.java

@@ -117,7 +117,8 @@ public CompletableFuture<LanguageModelToolResult[]> invoke(Map<String, Object> i
     } else if (isBackgroundObj instanceof String) {
       isBackground = Boolean.parseBoolean((String) isBackgroundObj);
     }
-    impl.setTerminalIcon(UiUtils.buildImageFromPngPath("/icons/github_copilot.png"));
+
+    impl.setTerminalIconDescriptor(UiUtils.buildImageDescriptorFromPngPath("/icons/github_copilot.png"));
 
     return impl.executeCommand(command, isBackground)
         .thenApply(result -> new LanguageModelToolResult[] { new LanguageModelToolResult(result) })