Skip to content

Commit 6ac706d

Browse files
committed
Merge remote-tracking branch 'origin/main' into tclem/rust-sdk-release-prep
2 parents e96aea6 + f7f9450 commit 6ac706d

264 files changed

Lines changed: 25940 additions & 2368 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dotnet/src/Client.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,8 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
632632
Traceparent: traceparent,
633633
Tracestate: tracestate,
634634
ModelCapabilities: config.ModelCapabilities,
635-
GitHubToken: config.GitHubToken);
635+
GitHubToken: config.GitHubToken,
636+
ContinuePendingWork: config.ContinuePendingWork);
636637

637638
var response = await InvokeRpcAsync<ResumeSessionResponse>(
638639
connection.Rpc, "session.resume", [request], cancellationToken);
@@ -1705,7 +1706,8 @@ internal record ResumeSessionRequest(
17051706
string? Traceparent = null,
17061707
string? Tracestate = null,
17071708
ModelCapabilitiesOverride? ModelCapabilities = null,
1708-
string? GitHubToken = null);
1709+
string? GitHubToken = null,
1710+
bool? ContinuePendingWork = null);
17091711

17101712
internal record ResumeSessionResponse(
17111713
string SessionId,
@@ -1773,6 +1775,7 @@ internal record PermissionRequestResponseV2(
17731775
[JsonSerializable(typeof(GetSessionMetadataResponse))]
17741776
[JsonSerializable(typeof(ModelCapabilitiesOverride))]
17751777
[JsonSerializable(typeof(PermissionRequestResult))]
1778+
[JsonSerializable(typeof(PermissionRequestResultKind))]
17761779
[JsonSerializable(typeof(PermissionRequestResponseV2))]
17771780
[JsonSerializable(typeof(ProviderConfig))]
17781781
[JsonSerializable(typeof(ResumeSessionRequest))]

dotnet/src/Generated/Rpc.cs

Lines changed: 88 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)