Merge branch 'main' into ethan/tbb-plan-usage

Author: jdneo

.github/skills/ui-action/SKILL.md

@@ -296,4 +296,4 @@ action is usable from every probe.
 ### Keep one probe focused
 
 Each JSON script represents one test case. Split unrelated behaviours into
-separate probes so a single `FAILED-step…` screenshot tells you what broke.
+separate probes so a single `FAILED-step…` screenshot tells you what broke.

README.md

@@ -61,6 +61,18 @@ MCP support enables integrating external tools and services into Copilot workflo
 - **Custom Agents** allow users to create personalized agents with specific instructions and behaviors.
 - **Isolated Subagents** can be spawned by the main agent to handle specific tasks or contexts independently.
 - **Plan Agent** can generate multi-step plans to accomplish complex tasks, breaking them down into manageable actions.
+- **Skills** are reusable, specialized AI assistant templates that enrich chat context in Agent Mode. Skills are defined as `SKILL.md` files and can be scoped to a workspace or shared globally.
+
+  - Creating Skills
+
+    Place a `SKILL.md` file in any of these directories:
+
+    - **Project-scoped:** `.github/skills/<skill-name>/`, `.claude/skills/<skill-name>/`, `.agents/skills/<skill-name>/`
+    - **User-scoped (global):** `~/.copilot/skills/<skill-name>/`, `~/.claude/skills/<skill-name>/`, `~/.agents/skills/<skill-name>/`
+
+    Each `SKILL.md` file can include YAML front matter with metadata (name, description) followed by Markdown content that provides domain knowledge, workflows, or instructions for the AI assistant.
+
+    Skills are automatically discovered and available in Agent Mode. You can enable or disable skills in **Window → Preferences → Copilot → Chat → Enable Skills**.
 
 For other available features in Eclipse, see the [Copilot feature matrix](https://docs.github.com/en/copilot/reference/copilot-feature-matrix?tool=eclipse).
 

com.microsoft.copilot.eclipse.core/copilot-agent/package-lock.json

@@ -12,11 +12,11 @@
     "postinstall": "node copy-binaries.js"
   },
   "dependencies": {
-    "@github/copilot-language-server": "1.482.0",
-    "@github/copilot-language-server-win32-x64": "1.482.0",
-    "@github/copilot-language-server-darwin-x64": "1.482.0",
-    "@github/copilot-language-server-darwin-arm64": "1.482.0",
-    "@github/copilot-language-server-linux-x64": "1.482.0",
-    "@github/copilot-language-server-linux-arm64": "1.482.0"
+    "@github/copilot-language-server": "1.484.0",
+    "@github/copilot-language-server-win32-x64": "1.484.0",
+    "@github/copilot-language-server-darwin-x64": "1.484.0",
+    "@github/copilot-language-server-darwin-arm64": "1.484.0",
+    "@github/copilot-language-server-linux-x64": "1.484.0",
+    "@github/copilot-language-server-linux-arm64": "1.484.0"
   }
 }

com.microsoft.copilot.eclipse.core/copilot-agent/package.json

@@ -28,6 +28,8 @@ private Constants() {
   public static final String WORKSPACE_CONTEXT_ENABLED = "workspaceContextEnabled";
   public static final String SUB_AGENT_ENABLED = "subAgentEnabled";
   public static final String AGENT_MAX_REQUESTS = "agentMaxRequests";
+  public static final String ENABLE_SKILLS = "enableSkills";
+  public static final String TRANSCRIPT_SUBDIR = ".copilot/eclipse";
   public static final String MCP = "mcp";
   public static final String MCP_REGISTRY_URL = "mcpRegistryUrl";
   public static final String MCP_REGISTRY_VERSION = "v0.1";

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/Constants.java

@@ -160,4 +160,10 @@ public class CopilotEventConstants {
    * Event when a rate limit warning is received from the language server.
    */
   public static final String TOPIC_RATE_LIMIT_WARNING = TOPIC_CHAT + "RATE_LIMIT_WARNING";
+
+  /**
+   * Event when custom prompts, skills, agents, or instructions change on the language server. Clients should re-fetch
+   * conversation templates on receipt.
+   */
+  public static final String TOPIC_CHAT_DID_CHANGE_CUSTOMIZATION_FILES = TOPIC_CHAT + "DID_CHANGE_CUSTOMIZATION_FILES";
 }

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/events/CopilotEventConstants.java

@@ -140,11 +140,11 @@ public CompletableFuture<Object[]> getConversationContext(ConversationContextPar
   public CompletableFuture<Object> invokeClientTool(InvokeClientToolParams params) {
     return CompletableFuture.supplyAsync(() -> {
       try {
-        CompletableFuture<LanguageModelToolResult[]> toolFuture =
-            CopilotCore.getPlugin().getChatEventsManager().invokeAgentTool(params);
+        CompletableFuture<LanguageModelToolResult[]> toolFuture = CopilotCore.getPlugin().getChatEventsManager()
+            .invokeAgentTool(params);
         if (toolFuture == null) {
-          CopilotCore.LOGGER.error(
-              new IllegalStateException("invokeAgentTool returned null for tool: " + params.getName()));
+          CopilotCore.LOGGER
+              .error(new IllegalStateException("invokeAgentTool returned null for tool: " + params.getName()));
           LanguageModelToolResult errorResult = new LanguageModelToolResult();
           errorResult.addContent("Failed to invoke the tool: tool invocation returned null");
           errorResult.setStatus(ToolInvocationStatus.error);
@@ -182,6 +182,8 @@ public CompletableFuture<Object[]> confirmClientTool(InvokeClientToolConfirmatio
     });
   }
 
+  // TODO: Should remove workspace-root folder as the projects are not directly under it in Eclipse, and can cause
+  // confusion in CLS.
   @Override
   public CompletableFuture<List<WorkspaceFolder>> workspaceFolders() {
     // Ideally, we should return each IProject as a workspace folder, but given that when
@@ -259,9 +261,30 @@ public void onRateLimitWarning(RateLimitWarningParams params) {
   }
 
   /**
-   * Handles the Dynamic OAuth request for MCP.
-   * Shows a dialog with multiple input fields and returns the user's input values.
-   * Returns null if the user cancels the request.
+   * Notify when custom skills change (global or workspace). Signal-only; clients re-fetch templates.
+   */
+  @JsonNotification("copilot/customSkill/didChange")
+  public void onDidChangeCustomSkill(Object params) {
+    notifyCustomizationFilesChanged();
+  }
+
+  /**
+   * Notify when custom prompts change (global or workspace). Signal-only; clients re-fetch templates.
+   */
+  @JsonNotification("copilot/customPrompt/didChange")
+  public void onDidChangeCustomPrompt(Object params) {
+    notifyCustomizationFilesChanged();
+  }
+
+  private void notifyCustomizationFilesChanged() {
+    if (eventBroker != null) {
+      eventBroker.post(CopilotEventConstants.TOPIC_CHAT_DID_CHANGE_CUSTOMIZATION_FILES, null);
+    }
+  }
+
+  /**
+   * Handles the Dynamic OAuth request for MCP. Shows a dialog with multiple input fields and returns the user's input
+   * values. Returns null if the user cancels the request.
    */
   @JsonRequest("copilot/dynamicOAuth")
   public CompletableFuture<Map<String, String>> mcpOauth(McpOauthRequest request) {
@@ -307,13 +330,11 @@ public void onDidChangePolicy(DidChangePolicyParams params) {
       }
       if (flags.isSubAgentPolicyEnabled() != params.isSubAgentEnabled()) {
         flags.setSubAgentPolicyEnabled(params.isSubAgentEnabled());
-        eventBroker.post(CopilotEventConstants.TOPIC_DID_CHANGE_SUB_AGENT_POLICY,
-            params.isSubAgentEnabled());
+        eventBroker.post(CopilotEventConstants.TOPIC_DID_CHANGE_SUB_AGENT_POLICY, params.isSubAgentEnabled());
       }
       if (flags.isCustomAgentPolicyEnabled() != params.isCustomAgentEnabled()) {
         flags.setCustomAgentPolicyEnabled(params.isCustomAgentEnabled());
-        eventBroker.post(CopilotEventConstants.TOPIC_DID_CHANGE_CUSTOM_AGENT_POLICY,
-            params.isCustomAgentEnabled());
+        eventBroker.post(CopilotEventConstants.TOPIC_DID_CHANGE_CUSTOM_AGENT_POLICY, params.isCustomAgentEnabled());
       }
     }
   }

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageClient.java

@@ -29,6 +29,7 @@
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationMode;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationModesParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTemplate;
+import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTemplatesParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTurnParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CopilotModel;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CopilotStatusResult;
@@ -140,9 +141,11 @@ public interface CopilotLanguageServer extends LanguageServer {
 
   /**
    * List conversation templates.
+   *
+   * @param params includes workspace folders for discovering workspace-specific prompt files and skills
    */
   @JsonRequest("conversation/templates")
-  CompletableFuture<ConversationTemplate[]> listTemplates(NullParams param);
+  CompletableFuture<ConversationTemplate[]> listTemplates(ConversationTemplatesParams params);
 
   /**
    * List conversation modes.

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/lsp/CopilotLanguageServer.java

@@ -20,6 +20,7 @@
 import org.eclipse.lsp4j.ProgressParams;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.eclipse.lsp4j.WorkspaceFolder;
 import org.eclipse.lsp4j.jsonrpc.Endpoint;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.LanguageServer;
@@ -46,6 +47,7 @@
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationMode;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationModesParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTemplate;
+import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTemplatesParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.ConversationTurnParams;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CopilotModel;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CopilotStatusResult;
@@ -278,6 +280,18 @@ public CompletableFuture<ChatCreateResult> createConversation(String workDoneTok
       List<IResource> files, IFile currentFile, Range currentSelection, List<Turn> turns, CopilotModel activeModel,
       String chatModeName, String customChatModeId, List<TodoItem> todos, String agentSlug,
       String agentJobWorkspaceFolder) {
+    return createConversation(workDoneToken, message, files, currentFile, currentSelection, turns, activeModel,
+        chatModeName, customChatModeId, todos, agentSlug, agentJobWorkspaceFolder, null, null);
+  }
+
+  /**
+   * Create a conversation with the given parameters, including optional conversationId and restoreToTurnId for session
+   * restoration.
+   */
+  public CompletableFuture<ChatCreateResult> createConversation(String workDoneToken, String message,
+      List<IResource> files, IFile currentFile, Range currentSelection, List<Turn> turns, CopilotModel activeModel,
+      String chatModeName, String customChatModeId, List<TodoItem> todos, String agentSlug,
+      String agentJobWorkspaceFolder, String conversationId, String restoreToTurnId) {
     boolean supportVision = activeModel.getCapabilities().supports().vision();
     Either<String, List<ChatCompletionContentPart>> messageWithImages = ChatMessageUtils
         .createMessageWithImages(message, FileUtils.filterFilesFrom(files), supportVision);
@@ -308,6 +322,13 @@ public CompletableFuture<ChatCreateResult> createConversation(String workDoneTok
 
       // TODO: remove needToolCallConfirmation when CLS fully supports it across all IDEs.
       param.setNeedToolCallConfirmation(true);
+
+      // Set conversationId and restoreToTurnId for session restoration from history
+      if (conversationId != null) {
+        param.setConversationId(conversationId);
+        param.setRestoreToTurnId(restoreToTurnId);
+      }
+
       if (currentFile != null) {
         param.setTextDocument(new TextDocumentIdentifier(FileUtils.getResourceUri(currentFile)));
         if (currentSelection != null) {
@@ -372,10 +393,12 @@ public CompletableFuture<ChatTurnResult> addConversationTurn(String workDoneToke
 
   /**
    * List the conversation templates.
+   *
+   * @param workspaceFolders workspace folders for discovering workspace-specific prompt files and skills
    */
-  public CompletableFuture<ConversationTemplate[]> listConversationTemplates() {
+  public CompletableFuture<ConversationTemplate[]> listConversationTemplates(List<WorkspaceFolder> workspaceFolders) {
     Function<LanguageServer, CompletableFuture<ConversationTemplate[]>> fn = server -> {
-      return ((CopilotLanguageServer) server).listTemplates(new NullParams());
+      return ((CopilotLanguageServer) server).listTemplates(new ConversationTemplatesParams(workspaceFolders));
     };
     return this.languageServerWrapper.execute(fn);
   }