Merge pull request #129 from copilot-community-sdk/copilot/upstream-sync-new-commits

brunoborges · web-flow · commit c5a8b2ddb20d · 2026-02-14T01:51:05.000-05:00
[upstream-sync] Port session context, filtering, and context_changed event (e40d57c)
diff --git a/.github/scripts/upstream-sync/merge-upstream-diff.sh b/.github/scripts/upstream-sync/merge-upstream-diff.sh
@@ -17,7 +17,7 @@
 # ──────────────────────────────────────────────────────────────
 set -euo pipefail
 
-ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
 ENV_FILE="$ROOT_DIR/.merge-env"
 
 if [[ ! -f "$ENV_FILE" ]]; then
diff --git a/.github/scripts/upstream-sync/merge-upstream-finish.sh b/.github/scripts/upstream-sync/merge-upstream-finish.sh
@@ -15,7 +15,7 @@
 # ──────────────────────────────────────────────────────────────
 set -euo pipefail
 
-ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
 ENV_FILE="$ROOT_DIR/.merge-env"
 
 if [[ ! -f "$ENV_FILE" ]]; then
diff --git a/.github/scripts/upstream-sync/merge-upstream-start.sh b/.github/scripts/upstream-sync/merge-upstream-start.sh
@@ -14,7 +14,7 @@
 # ──────────────────────────────────────────────────────────────
 set -euo pipefail
 
-ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "$ROOT_DIR"
 
 UPSTREAM_REPO="https://github.com/github/copilot-sdk.git"
diff --git a/.lastmerge b/.lastmerge
@@ -1 +1 @@
-4dc562951a51097618a69a1837f7af06c73d1113
+e40d57c86e18b495722adbf42045288c03924342
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,49 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
-> **Upstream sync:** [`github/copilot-sdk@05e3c46`](https://github.com/github/copilot-sdk/commit/05e3c46c8c23130c9c064dc43d00ec78f7a75eab)
+> **Upstream sync:** [`github/copilot-sdk@e40d57c`](https://github.com/github/copilot-sdk/commit/e40d57c86e18b495722adbf42045288c03924342)
+
+### Added
+
+#### Session Context and Filtering
+
+Added session context tracking and filtering capabilities to help manage multiple Copilot sessions across different repositories and working directories.
+
+**New Classes:**
+- `SessionContext` - Represents working directory context (cwd, gitRoot, repository, branch) with fluent setters
+- `SessionListFilter` - Filter sessions by context fields (extends SessionContext)
+- `SessionContextChangedEvent` - Event fired when working directory context changes between turns
+
+**Updated APIs:**
+- `SessionMetadata.getContext()` - Returns optional context information for persisted sessions
+- `CopilotClient.listSessions(SessionListFilter)` - New overload to filter sessions by context criteria
+
+**Example:**
+```java
+// List sessions for a specific repository
+var filter = new SessionListFilter()
+    .setRepository("owner/repo")
+    .setBranch("main");
+var sessions = client.listSessions(filter).get();
+
+// Access context information
+for (var session : sessions) {
+    var ctx = session.getContext();
+    if (ctx != null) {
+        System.out.println("CWD: " + ctx.getCwd());
+        System.out.println("Repo: " + ctx.getRepository());
+    }
+}
+
+// Listen for context changes
+session.on(SessionContextChangedEvent.class, event -> {
+    SessionContext newContext = event.getData();
+    System.out.println("Working directory changed to: " + newContext.getCwd());
+});
+```
+
+**Requirements:**
+- GitHub Copilot CLI 0.0.409 or later
 
 ## [1.0.8] - 2026-02-08
 
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Java SDK for programmatic control of GitHub Copilot CLI, enabling you to build A
 ### Requirements
 
 - Java 17 or later
-- GitHub Copilot CLI 0.0.406 or later installed and in PATH (or provide custom `cliPath`)
+- GitHub Copilot CLI 0.0.409 or later installed and in PATH (or provide custom `cliPath`)
 
 ### Maven
 
diff --git a/src/main/java/com/github/copilot/sdk/CopilotClient.java b/src/main/java/com/github/copilot/sdk/CopilotClient.java
@@ -30,6 +30,7 @@
 import com.github.copilot.sdk.json.ResumeSessionResponse;
 import com.github.copilot.sdk.json.SessionConfig;
 import com.github.copilot.sdk.json.SessionLifecycleHandler;
+import com.github.copilot.sdk.json.SessionListFilter;
 import com.github.copilot.sdk.json.SessionMetadata;
 
 /**
@@ -474,9 +475,41 @@ public CompletableFuture<Void> deleteSession(String sessionId) {
      * @see #resumeSession(String)
      */
     public CompletableFuture<List<SessionMetadata>> listSessions() {
-        return ensureConnected()
-                .thenCompose(connection -> connection.rpc.invoke("session.list", Map.of(), ListSessionsResponse.class)
-                        .thenApply(ListSessionsResponse::sessions));
+        return listSessions(null);
+    }
+
+    /**
+     * Lists all available sessions with optional filtering.
+     * <p>
+     * Returns metadata about all sessions that can be resumed, including their IDs,
+     * start times, summaries, and context information. Use the filter parameter to
+     * narrow down sessions by working directory, git repository, or branch.
+     *
+     * <h2>Example Usage</h2>
+     *
+     * <pre>{@code
+     * // List all sessions
+     * var allSessions = client.listSessions().get();
+     *
+     * // Filter by repository
+     * var filter = new SessionListFilter().setRepository("owner/repo");
+     * var repoSessions = client.listSessions(filter).get();
+     * }</pre>
+     *
+     * @param filter
+     *            optional filter to narrow down sessions by context fields, or
+     *            {@code null} to list all sessions
+     * @return a future that resolves with a list of session metadata
+     * @see SessionMetadata
+     * @see SessionListFilter
+     * @see #resumeSession(String)
+     */
+    public CompletableFuture<List<SessionMetadata>> listSessions(SessionListFilter filter) {
+        return ensureConnected().thenCompose(connection -> {
+            Map<String, Object> params = filter != null ? Map.of("filter", filter) : Map.of();
+            return connection.rpc.invoke("session.list", params, ListSessionsResponse.class)
+                    .thenApply(ListSessionsResponse::sessions);
+        });
     }
 
     /**
diff --git a/src/main/java/com/github/copilot/sdk/events/AbstractSessionEvent.java b/src/main/java/com/github/copilot/sdk/events/AbstractSessionEvent.java
@@ -54,6 +54,7 @@ public abstract sealed class AbstractSessionEvent permits
         SessionStartEvent, SessionResumeEvent, SessionErrorEvent, SessionIdleEvent, SessionInfoEvent,
         SessionModelChangeEvent, SessionHandoffEvent, SessionTruncationEvent, SessionSnapshotRewindEvent,
         SessionUsageInfoEvent, SessionCompactionStartEvent, SessionCompactionCompleteEvent, SessionShutdownEvent,
+        SessionContextChangedEvent,
         // Assistant events
         AssistantTurnStartEvent, AssistantIntentEvent, AssistantReasoningEvent, AssistantReasoningDeltaEvent,
         AssistantMessageEvent, AssistantMessageDeltaEvent, AssistantTurnEndEvent, AssistantUsageEvent, AbortEvent,
diff --git a/src/main/java/com/github/copilot/sdk/events/SessionContextChangedEvent.java b/src/main/java/com/github/copilot/sdk/events/SessionContextChangedEvent.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.events;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.sdk.json.SessionContext;
+
+/**
+ * Event: session.context_changed
+ * <p>
+ * Fired when the working directory context changes between turns. Contains the
+ * updated context information including cwd, git root, repository, and branch.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public final class SessionContextChangedEvent extends AbstractSessionEvent {
+
+    @JsonProperty("data")
+    private SessionContext data;
+
+    @Override
+    public String getType() {
+        return "session.context_changed";
+    }
+
+    public SessionContext getData() {
+        return data;
+    }
+
+    public void setData(SessionContext data) {
+        this.data = data;
+    }
+}
diff --git a/src/main/java/com/github/copilot/sdk/events/SessionEventParser.java b/src/main/java/com/github/copilot/sdk/events/SessionEventParser.java
@@ -61,6 +61,7 @@ public class SessionEventParser {
         TYPE_MAP.put("session.usage_info", SessionUsageInfoEvent.class);
         TYPE_MAP.put("session.compaction_start", SessionCompactionStartEvent.class);
         TYPE_MAP.put("session.compaction_complete", SessionCompactionCompleteEvent.class);
+        TYPE_MAP.put("session.context_changed", SessionContextChangedEvent.class);
         TYPE_MAP.put("user.message", UserMessageEvent.class);
         TYPE_MAP.put("pending_messages.modified", PendingMessagesModifiedEvent.class);
         TYPE_MAP.put("assistant.turn_start", AssistantTurnStartEvent.class);
diff --git a/src/main/java/com/github/copilot/sdk/json/SessionContext.java b/src/main/java/com/github/copilot/sdk/json/SessionContext.java
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Working directory context for a session.
+ * <p>
+ * Contains information about the working directory where the session was
+ * created, including git repository information if applicable.
+ *
+ * @since 1.0.0
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SessionContext {
+
+    @JsonProperty("cwd")
+    private String cwd;
+
+    @JsonProperty("gitRoot")
+    private String gitRoot;
+
+    @JsonProperty("repository")
+    private String repository;
+
+    @JsonProperty("branch")
+    private String branch;
+
+    /**
+     * Gets the working directory where the session was created.
+     *
+     * @return the current working directory path
+     */
+    public String getCwd() {
+        return cwd;
+    }
+
+    /**
+     * Sets the working directory.
+     *
+     * @param cwd
+     *            the current working directory path
+     * @return this instance for method chaining
+     */
+    public SessionContext setCwd(String cwd) {
+        this.cwd = cwd;
+        return this;
+    }
+
+    /**
+     * Gets the git repository root directory.
+     *
+     * @return the git root path, or {@code null} if not in a git repository
+     */
+    public String getGitRoot() {
+        return gitRoot;
+    }
+
+    /**
+     * Sets the git repository root directory.
+     *
+     * @param gitRoot
+     *            the git root path
+     * @return this instance for method chaining
+     */
+    public SessionContext setGitRoot(String gitRoot) {
+        this.gitRoot = gitRoot;
+        return this;
+    }
+
+    /**
+     * Gets the GitHub repository in "owner/repo" format.
+     *
+     * @return the repository identifier, or {@code null} if not available
+     */
+    public String getRepository() {
+        return repository;
+    }
+
+    /**
+     * Sets the GitHub repository.
+     *
+     * @param repository
+     *            the repository in "owner/repo" format
+     * @return this instance for method chaining
+     */
+    public SessionContext setRepository(String repository) {
+        this.repository = repository;
+        return this;
+    }
+
+    /**
+     * Gets the current git branch.
+     *
+     * @return the branch name, or {@code null} if not available
+     */
+    public String getBranch() {
+        return branch;
+    }
+
+    /**
+     * Sets the git branch.
+     *
+     * @param branch
+     *            the branch name
+     * @return this instance for method chaining
+     */
+    public SessionContext setBranch(String branch) {
+        this.branch = branch;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/copilot/sdk/json/SessionListFilter.java b/src/main/java/com/github/copilot/sdk/json/SessionListFilter.java
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot.sdk.json;
+
+/**
+ * Filter options for listing sessions.
+ * <p>
+ * Extends {@link SessionContext} to provide filtering capabilities with fluent
+ * setter methods that return the filter instance for method chaining.
+ *
+ * <h2>Example Usage</h2>
+ *
+ * <pre>{@code
+ * // Filter sessions by repository
+ * var filter = new SessionListFilter().setRepository("owner/repo");
+ * var sessions = client.listSessions(filter).get();
+ *
+ * // Filter by working directory
+ * var filter = new SessionListFilter().setCwd("/path/to/project");
+ * var sessions = client.listSessions(filter).get();
+ * }</pre>
+ *
+ * @see com.github.copilot.sdk.CopilotClient#listSessions(SessionListFilter)
+ * @since 1.0.0
+ */
+public class SessionListFilter extends SessionContext {
+
+    /**
+     * Sets the filter for exact cwd match.
+     *
+     * @param cwd
+     *            the current working directory to filter by
+     * @return this filter for method chaining
+     */
+    @Override
+    public SessionListFilter setCwd(String cwd) {
+        super.setCwd(cwd);
+        return this;
+    }
+
+    /**
+     * Sets the filter for git root directory.
+     *
+     * @param gitRoot
+     *            the git root path to filter by
+     * @return this filter for method chaining
+     */
+    @Override
+    public SessionListFilter setGitRoot(String gitRoot) {
+        super.setGitRoot(gitRoot);
+        return this;
+    }
+
+    /**
+     * Sets the filter for repository (in "owner/repo" format).
+     *
+     * @param repository
+     *            the repository identifier to filter by
+     * @return this filter for method chaining
+     */
+    @Override
+    public SessionListFilter setRepository(String repository) {
+        super.setRepository(repository);
+        return this;
+    }
+
+    /**
+     * Sets the filter for git branch.
+     *
+     * @param branch
+     *            the branch name to filter by
+     * @return this filter for method chaining
+     */
+    @Override
+    public SessionListFilter setBranch(String branch) {
+        super.setBranch(branch);
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/copilot/sdk/json/SessionMetadata.java b/src/main/java/com/github/copilot/sdk/json/SessionMetadata.java
diff --git a/src/site/markdown/advanced.md b/src/site/markdown/advanced.md
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
diff --git a/src/test/java/com/github/copilot/sdk/CopilotSessionTest.java b/src/test/java/com/github/copilot/sdk/CopilotSessionTest.java

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4dc562951a51097618a69a1837f7af06c73d1113`
	`1`	`+e40d57c86e18b495722adbf42045288c03924342`