Skip to content

Commit 07c5960

Browse files
brunoborgesbrunoborges
authored
Merge pull request #144 from copilot-community-sdk/copilot/upstream-sync-13-new-commits
Upstream sync: clientName, deny-by-default permissions, PermissionHandler.APPROVE_ALL
2 parents f4d1f2e + 0867d15 commit 07c5960

15 files changed

Lines changed: 253 additions & 32 deletions

‎.lastmerge‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5016587a62652f3d184b3c6958dfc63359921aa8
1+
c263dfc69055f9f28ee2d4b121cf617fca5a42dc

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
88
99
## [Unreleased]
1010

11-
> **Upstream sync:** [`github/copilot-sdk@e40d57c`](https://github.com/github/copilot-sdk/commit/e40d57c86e18b495722adbf42045288c03924342)
11+
> **Upstream sync:** [`github/copilot-sdk@c263dfc`](https://github.com/github/copilot-sdk/commit/c263dfc69055f9f28ee2d4b121cf617fca5a42dc)
12+
13+
### Added
14+
15+
- `SessionConfig.setClientName(String)` / `getClientName()` — identifies the application using the SDK; included in the User-Agent header for API requests (upstream: [`397ef66`](https://github.com/github/copilot-sdk/commit/397ef66))
16+
- `ResumeSessionConfig.setClientName(String)` / `getClientName()` — same for resumed sessions
17+
- `PermissionHandler.APPROVE_ALL` — pre-built handler that approves all permission requests (upstream: [`3e2d2b2`](https://github.com/github/copilot-sdk/commit/3e2d2b2))
18+
19+
### Changed
20+
21+
- **Breaking:** permissions are now denied by default when no `OnPermissionRequest` handler is provided. The `requestPermission` flag is always sent as `true` so the server calls back for every permission request; the SDK returns a deny result when no handler is registered (upstream: [`3e2d2b2`](https://github.com/github/copilot-sdk/commit/3e2d2b2))
1222

1323
## [1.0.9] - 2026-02-16
1424

‎src/main/java/com/github/copilot/sdk/SessionRequestBuilder.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,28 @@ private SessionRequestBuilder() {
3131
*/
3232
static CreateSessionRequest buildCreateRequest(SessionConfig config) {
3333
var request = new CreateSessionRequest();
34+
// Always request permission callbacks to enable deny-by-default behavior
35+
request.setRequestPermission(true);
36+
// Always send envValueMode=direct for MCP servers
37+
request.setEnvValueMode("direct");
3438
if (config == null) {
3539
return request;
3640
}
3741

3842
request.setModel(config.getModel());
3943
request.setSessionId(config.getSessionId());
44+
request.setClientName(config.getClientName());
4045
request.setReasoningEffort(config.getReasoningEffort());
4146
request.setTools(config.getTools());
4247
request.setSystemMessage(config.getSystemMessage());
4348
request.setAvailableTools(config.getAvailableTools());
4449
request.setExcludedTools(config.getExcludedTools());
4550
request.setProvider(config.getProvider());
46-
request.setRequestPermission(config.getOnPermissionRequest() != null ? true : null);
4751
request.setRequestUserInput(config.getOnUserInputRequest() != null ? true : null);
4852
request.setHooks(config.getHooks() != null && config.getHooks().hasHooks() ? true : null);
4953
request.setWorkingDirectory(config.getWorkingDirectory());
5054
request.setStreaming(config.isStreaming() ? true : null);
5155
request.setMcpServers(config.getMcpServers());
52-
request.setEnvValueMode("direct");
5356
request.setCustomAgents(config.getCustomAgents());
5457
request.setInfiniteSessions(config.getInfiniteSessions());
5558
request.setSkillDirectories(config.getSkillDirectories());
@@ -71,27 +74,30 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config) {
7174
static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionConfig config) {
7275
var request = new ResumeSessionRequest();
7376
request.setSessionId(sessionId);
77+
// Always request permission callbacks to enable deny-by-default behavior
78+
request.setRequestPermission(true);
79+
// Always send envValueMode=direct for MCP servers
80+
request.setEnvValueMode("direct");
7481

7582
if (config == null) {
7683
return request;
7784
}
7885

7986
request.setModel(config.getModel());
87+
request.setClientName(config.getClientName());
8088
request.setReasoningEffort(config.getReasoningEffort());
8189
request.setTools(config.getTools());
8290
request.setSystemMessage(config.getSystemMessage());
8391
request.setAvailableTools(config.getAvailableTools());
8492
request.setExcludedTools(config.getExcludedTools());
8593
request.setProvider(config.getProvider());
86-
request.setRequestPermission(config.getOnPermissionRequest() != null ? true : null);
8794
request.setRequestUserInput(config.getOnUserInputRequest() != null ? true : null);
8895
request.setHooks(config.getHooks() != null && config.getHooks().hasHooks() ? true : null);
8996
request.setWorkingDirectory(config.getWorkingDirectory());
9097
request.setConfigDir(config.getConfigDir());
9198
request.setDisableResume(config.isDisableResume() ? true : null);
9299
request.setStreaming(config.isStreaming() ? true : null);
93100
request.setMcpServers(config.getMcpServers());
94-
request.setEnvValueMode("direct");
95101
request.setCustomAgents(config.getCustomAgents());
96102
request.setSkillDirectories(config.getSkillDirectories());
97103
request.setDisabledSkills(config.getDisabledSkills());

‎src/main/java/com/github/copilot/sdk/json/CreateSessionRequest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public final class CreateSessionRequest {
3131
@JsonProperty("sessionId")
3232
private String sessionId;
3333

34+
@JsonProperty("clientName")
35+
private String clientName;
36+
3437
@JsonProperty("reasoningEffort")
3538
private String reasoningEffort;
3639

@@ -105,6 +108,16 @@ public void setSessionId(String sessionId) {
105108
this.sessionId = sessionId;
106109
}
107110

111+
/** Gets the client name. @return the client name */
112+
public String getClientName() {
113+
return clientName;
114+
}
115+
116+
/** Sets the client name. @param clientName the client name */
117+
public void setClientName(String clientName) {
118+
this.clientName = clientName;
119+
}
120+
108121
/** Gets the reasoning effort. @return the reasoning effort level */
109122
public String getReasoningEffort() {
110123
return reasoningEffort;

‎src/main/java/com/github/copilot/sdk/json/PermissionHandler.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
* };
2929
* }</pre>
3030
*
31+
* <p>
32+
* A pre-built handler that approves all requests is available as
33+
* {@link #APPROVE_ALL}.
34+
*
3135
* @see SessionConfig#setOnPermissionRequest(PermissionHandler)
3236
* @see PermissionRequest
3337
* @see PermissionRequestResult
@@ -36,6 +40,14 @@
3640
@FunctionalInterface
3741
public interface PermissionHandler {
3842

43+
/**
44+
* A pre-built handler that approves all permission requests.
45+
*
46+
* @since 1.0.11
47+
*/
48+
PermissionHandler APPROVE_ALL = (request, invocation) -> CompletableFuture
49+
.completedFuture(new PermissionRequestResult().setKind("approved"));
50+
3951
/**
4052
* Handles a permission request from the assistant.
4153
* <p>

‎src/main/java/com/github/copilot/sdk/json/ResumeSessionConfig.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
@JsonInclude(JsonInclude.Include.NON_NULL)
3434
public class ResumeSessionConfig {
3535

36+
private String clientName;
3637
private String model;
3738
private List<ToolDefinition> tools;
3839
private SystemMessageConfig systemMessage;
@@ -76,6 +77,29 @@ public ResumeSessionConfig setModel(String model) {
7677
return this;
7778
}
7879

80+
/**
81+
* Gets the client name used to identify the application using the SDK.
82+
*
83+
* @return the client name, or {@code null} if not set
84+
*/
85+
public String getClientName() {
86+
return clientName;
87+
}
88+
89+
/**
90+
* Sets the client name to identify the application using the SDK.
91+
* <p>
92+
* This value is included in the User-Agent header for API requests.
93+
*
94+
* @param clientName
95+
* the client name
96+
* @return this config for method chaining
97+
*/
98+
public ResumeSessionConfig setClientName(String clientName) {
99+
this.clientName = clientName;
100+
return this;
101+
}
102+
79103
/**
80104
* Gets the custom tools for this session.
81105
*
@@ -491,6 +515,7 @@ public ResumeSessionConfig setInfiniteSessions(InfiniteSessionConfig infiniteSes
491515
@Override
492516
public ResumeSessionConfig clone() {
493517
ResumeSessionConfig copy = new ResumeSessionConfig();
518+
copy.clientName = this.clientName;
494519
copy.model = this.model;
495520
copy.tools = this.tools != null ? new ArrayList<>(this.tools) : null;
496521
copy.systemMessage = this.systemMessage;

‎src/main/java/com/github/copilot/sdk/json/ResumeSessionRequest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public final class ResumeSessionRequest {
2929
@JsonProperty("sessionId")
3030
private String sessionId;
3131

32+
@JsonProperty("clientName")
33+
private String clientName;
34+
3235
@JsonProperty("model")
3336
private String model;
3437

@@ -99,6 +102,16 @@ public void setSessionId(String sessionId) {
99102
this.sessionId = sessionId;
100103
}
101104

105+
/** Gets the client name. @return the client name */
106+
public String getClientName() {
107+
return clientName;
108+
}
109+
110+
/** Sets the client name. @param clientName the client name */
111+
public void setClientName(String clientName) {
112+
this.clientName = clientName;
113+
}
114+
102115
/** Gets the model name. @return the model */
103116
public String getModel() {
104117
return model;

‎src/main/java/com/github/copilot/sdk/json/SessionConfig.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
public class SessionConfig {
3535

3636
private String sessionId;
37+
private String clientName;
3738
private String model;
3839
private String reasoningEffort;
3940
private List<ToolDefinition> tools;
@@ -76,6 +77,29 @@ public SessionConfig setSessionId(String sessionId) {
7677
return this;
7778
}
7879

80+
/**
81+
* Gets the client name used to identify the application using the SDK.
82+
*
83+
* @return the client name, or {@code null} if not set
84+
*/
85+
public String getClientName() {
86+
return clientName;
87+
}
88+
89+
/**
90+
* Sets the client name to identify the application using the SDK.
91+
* <p>
92+
* This value is included in the User-Agent header for API requests.
93+
*
94+
* @param clientName
95+
* the client name
96+
* @return this config instance for method chaining
97+
*/
98+
public SessionConfig setClientName(String clientName) {
99+
this.clientName = clientName;
100+
return this;
101+
}
102+
79103
/**
80104
* Gets the AI model to use.
81105
*
@@ -529,6 +553,7 @@ public SessionConfig setConfigDir(String configDir) {
529553
public SessionConfig clone() {
530554
SessionConfig copy = new SessionConfig();
531555
copy.sessionId = this.sessionId;
556+
copy.clientName = this.clientName;
532557
copy.model = this.model;
533558
copy.reasoningEffort = this.reasoningEffort;
534559
copy.tools = this.tools != null ? new ArrayList<>(this.tools) : null;

‎src/test/java/com/github/copilot/sdk/ConfigCloneTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ void copilotClientOptionsEnvironmentIndependence() {
6868
void sessionConfigCloneBasic() {
6969
SessionConfig original = new SessionConfig();
7070
original.setSessionId("my-session");
71+
original.setClientName("my-app");
7172
original.setModel("gpt-4o");
7273
original.setStreaming(true);
7374

7475
SessionConfig cloned = original.clone();
7576

7677
assertEquals(original.getSessionId(), cloned.getSessionId());
78+
assertEquals(original.getClientName(), cloned.getClientName());
7779
assertEquals(original.getModel(), cloned.getModel());
7880
assertEquals(original.isStreaming(), cloned.isStreaming());
7981
}

‎src/test/java/com/github/copilot/sdk/CopilotSessionTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.github.copilot.sdk.events.ToolExecutionStartEvent;
3131
import com.github.copilot.sdk.events.UserMessageEvent;
3232
import com.github.copilot.sdk.json.MessageOptions;
33+
import com.github.copilot.sdk.json.PermissionHandler;
3334
import com.github.copilot.sdk.json.SessionConfig;
3435
import com.github.copilot.sdk.json.SystemMessageConfig;
3536
import com.github.copilot.sdk.json.ToolDefinition;
@@ -180,7 +181,8 @@ void testSendReturnsImmediatelyWhileEventsStreamInBackground() throws Exception
180181
ctx.configureForTest("session", "send_returns_immediately_while_events_stream_in_background");
181182

182183
try (CopilotClient client = ctx.createClient()) {
183-
CopilotSession session = client.createSession().get();
184+
CopilotSession session = client
185+
.createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
184186

185187
var events = new ArrayList<String>();
186188
var lastMessage = new AtomicReference<AssistantMessageEvent>();

0 commit comments

Comments
 (0)