Preserve Java commit authorship from standalone repo by edburns · Pull Request #1561 · github/copilot-sdk

edburns · 2026-06-03T00:21:17Z

At the request of @brunoborges, this PR merges the rewritten commit history from the standalone copilot-sdk-java repo into the monorepo to preserve original commit authorship on .java files.

What this does

Used git filter-repo on a disposable clone of the standalone repo (copilot-sdk-java) to extract only *.java files, remapped under the java/ subdirectory.
Merged the rewritten history into this branch with --allow-unrelated-histories.
Because the file content was pre-synced (the "invariant" — standalone .java files identical to monorepo), the merge produces zero file diffs.

What this means for reviewers

The PR diff is empty — no source files changed.
git log --follow on any java/**/*.java file now traces back to the original authors (Bruno Borges, Ed Burns, Mackinnon Buck, Stephen Toub, copilot-swe-agent, etc.).
143 commits by @brunoborges are now part of the monorepo's history.

Verification

git log --follow --format="%h %an %s" java/src/main/java/com/github/copilot/CopilotClient.java | head -20
git log --all --author="Bruno" --oneline | wc -l  # 143

…-actions-workflow Fix CompactionTest timeout caused by prompt mismatch with snapshot

…see

…see refs Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

…umentation-and-samples Sync docs and samples with breaking session permission API changes

…eam-repo-again Upstream sync: session.setModel() and built-in tool override support

…ntation-for-new-methods Document missing PR #162 CopilotSession APIs in advanced guide

… E2E test updates Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

…eam-changes-please-work Upstream sync: port 27 new commits from github/copilot-sdk (2026-03-05)

modified: .github/release.yml modified: .github/templates/index.html modified: .github/workflows/deploy-site.yml modified: .github/workflows/notes.template modified: .github/workflows/publish-maven.yml modified: README.md modified: jbang-example.java modified: pom.xml modified: src/main/java/com/github/copilot/sdk/package-info.java modified: src/site/markdown/cookbook/error-handling.md modified: src/site/markdown/cookbook/managing-local-files.md modified: src/site/markdown/cookbook/multiple-sessions.md modified: src/site/markdown/cookbook/persisting-sessions.md modified: src/site/markdown/cookbook/pr-visualization.md modified: src/site/markdown/getting-started.md modified: src/site/markdown/index.md modified: src/site/site.xml On branch edburns/dd-2785864-pre-public-non-code-changes modified: .github/release.yml modified: .github/templates/index.html modified: .github/workflows/deploy-site.yml modified: .github/workflows/notes.template modified: .github/workflows/publish-maven.yml modified: README.md modified: jbang-example.java modified: pom.xml modified: src/main/java/com/github/copilot/sdk/package-info.java modified: src/site/markdown/cookbook/error-handling.md modified: src/site/markdown/cookbook/managing-local-files.md modified: src/site/markdown/cookbook/multiple-sessions.md modified: src/site/markdown/cookbook/persisting-sessions.md modified: src/site/markdown/cookbook/pr-visualization.md modified: src/site/markdown/getting-started.md modified: src/site/markdown/index.md modified: src/site/site.xml Signed-off-by: Ed Burns <edburns@microsoft.com>

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

@brunoborges

modified: README.md modified: jbang-example.java modified: src/site/markdown/cookbook/error-handling.md modified: src/site/markdown/cookbook/managing-local-files.md modified: src/site/markdown/cookbook/multiple-sessions.md modified: src/site/markdown/cookbook/persisting-sessions.md modified: src/site/markdown/cookbook/pr-visualization.md Fixed comment from @brunoborges: > The pin snapshot version is 0.1.30, therefore all places that reference a version that is supposed to be on Maven Central, must be 0.1.29 (as if it was there already).

…pl is at 0.1.32. modified: README.md modified: jbang-example.java modified: pom.xml modified: src/site/markdown/cookbook/error-handling.md modified: src/site/markdown/cookbook/managing-local-files.md modified: src/site/markdown/cookbook/multiple-sessions.md modified: src/site/markdown/cookbook/persisting-sessions.md modified: src/site/markdown/cookbook/pr-visualization.md no changes added to commit (use "git add" and/or "git commit -a")

…eam-changes-c4886a91-010c-45c9-8dcc-6c8f8229fe9a docs: clarify session close vs delete semantics (upstream sync #599)

…785864-pre-public-non-code-changes

…ents, register-before-RPC Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

…itch; bump minimum Java to 21 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

…if/else instanceof Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

…(ported from #185)

…eam-commits-again [upstream-sync] Port 24 upstream commits through 9a0a1a5 (protocol v3, BYOK models, agent pre-selection, OnEvent, broadcast events)

…785864-pre-public-non-code-changes # Conflicts: # README.md # jbang-example.java # pom.xml

Your branch is up to date with 'origin/edburns/dd-2785864-pre-public-non-code-changes'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: src/main/java/com/github/copilot/sdk/package-info.java no changes added to commit (use "git add" and/or "git commit -a")

Edburns/ghcp sp 115 java repackage

…o 1.1.0 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Add AgentMode enum and plumb agentMode through message send

…y mode hardening from reference implementation - Add PostToolUseFailureHookInput, PostToolUseFailureHookOutput, and PostToolUseFailureHandler - Wire postToolUseFailure hook in SessionHooks and CopilotSession - Add CopilotClientMode enum (EMPTY vs COPILOT_CLI) - Add mode field to CopilotClientOptions with COPILOT_CLI default - Add ToolSet builder class for source-qualified tool filter patterns - Add BuiltInTools constants (ISOLATED set) - Add Empty mode validation: requires copilotHome, requires availableTools per session - Set toolFilterPrecedence=excluded in Empty mode for both create and resume - Add skipCustomInstructions, customAgentsLocalOnly, coauthorEnabled, manageScheduleEnabled to SessionConfig and ResumeSessionConfig - Add RUNTIME_INSTRUCTIONS to SystemPromptSections - Add factory methods and feedback field to PermissionRequestResult - Add toolFilterPrecedence to CreateSessionRequest and ResumeSessionRequest Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

…esult Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Auto-committed by codegen-check workflow.

- CapabilitiesChangedUI now has 3 fields (elicitation, mcpApps, canvases); update test to pass null for the two new fields - AssistantMessageEventData now has 16 fields (added parentToolCallId); update test to pass null for the new field Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

…avadoc - Update EMPTY mode error message to mention both CopilotHome and CliUrl - Add availableTools validation in resumeSession() for EMPTY mode - Add null-checks for hook handler return values to prevent NPE - Fix misleading Javadoc in SessionConfig/ResumeSessionConfig for EMPTY-mode options that are not yet wired to the protocol - Fix Javadoc formatting in ResumeSessionConfig clear* methods - Update CopilotClientMode.EMPTY Javadoc to match actual validation Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Update 8 Javadoc blocks in SessionConfig and ResumeSessionConfig that incorrectly claimed skipCustomInstructions, customAgentsLocalOnly, coauthorEnabled, and manageScheduleEnabled were not yet propagated to the wire protocol. All reference implementations (Node.js, .NET, Go) propagate these via session.options.update.

Implement updateSessionOptionsForMode() in CopilotClient to send session.options.update RPC call after session creation and resumption, matching the behavior of the Node.js, .NET, and Go reference implementations. In EMPTY mode, safe defaults are applied. In COPILOT_CLI mode, only explicitly-set fields are forwarded. Includes 8 unit tests covering both modes and partial overrides.

When the server returns a different sessionId and a subsequent step (e.g. updateSessionOptionsForMode) fails, the exceptionally blocks only removed the original sessionId from the sessions map, leaving the re-keyed entry behind as a stale/closed session. Fix: remove both the original and the active (possibly re-keyed) session ID in createSession/resumeSession exceptionally blocks, and unregister the session from the registry in updateSessionOptionsForMode before closing it. Addresses review comments on copilot-sdk PR #1473.

…aths Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

…k-review Add CreateSessionReKeyEntryTest for session-map re-key cleanup paths

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Update URL in package-info.java

Copilot

Copilot wasn't able to review any files in this pull request.

brunoborges and others added 30 commits March 3, 2026 10:35

Merge pull request #160 from copilot-community-sdk/copilot/fix-github…

4065548

…-actions-workflow Fix CompactionTest timeout caused by prompt mismatch with snapshot

Address review feedback: add parser tests for new fields, fix Javadoc @…

27577a7

…see refs Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Update docs and samples for required permission handlers

4cb1e3b

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Port session.setModel() and built-in tool override support from upstream

5034dad

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Harden documentation sample API guard test

34bb92d

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Potential fix for pull request finding 'Useless parameter'

920f066

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Run spotless apply on documentation samples test

0c3f98a

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Merge pull request #164 from copilot-community-sdk/copilot/update-doc…

4d2ddce

…umentation-and-samples Sync docs and samples with breaking session permission API changes

Merge pull request #162 from copilot-community-sdk/copilot/sync-upstr…

5fba8e5

…eam-repo-again Upstream sync: session.setModel() and built-in tool override support

Initial plan

5f77839

Initial plan

88a3e60

Merge pull request #166 from copilot-community-sdk/copilot/add-docume…

e46dc8e

…ntation-for-new-methods Document missing PR #162 CopilotSession APIs in advanced guide

docs: update version references to 1.0.10

66b69ef

Port upstream changes: PermissionRequestResultKind, CI detection fix,…

2734dc7

… E2E test updates Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Merge pull request #174 from copilot-community-sdk/copilot/sync-upstr…

da8d406

…eam-changes-please-work Upstream sync: port 27 new commits from github/copilot-sdk (2026-03-05)

docs: clarify session close vs delete semantics (upstream sync #599)

93ef7c9

Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Merge pull request #177 from copilot-community-sdk/copilot/sync-upstr…

1e5e027

…eam-changes-c4886a91-010c-45c9-8dcc-6c8f8229fe9a docs: clarify session close vs delete semantics (upstream sync #599)

Merge remote-tracking branch 'public-upstream/main' into edburns/dd-2…

7be0249

…785864-pre-public-non-code-changes

Initial plan

da66bcd

Port upstream sync: protocol v3, OnListModels, agent, onEvent, new ev…

c35fd9b

…ents, register-before-RPC Co-authored-by: brunoborges <129743+brunoborges@users.noreply.github.com>

Refactor handleBroadcastEventAsync to use Java 21 pattern matching sw…

d0794f4

…itch; bump minimum Java to 21 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Revert Java 21 bump and pattern-matching switch; restore Java 17 and …

cc7358e

…if/else instanceof Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Fix: use correct permission denial kind and send errors back via RPC …

59054ea

…(ported from #185)

Merge pull request #184 from copilot-community-sdk/copilot/sync-upstr…

ae552a2

…eam-commits-again [upstream-sync] Port 24 upstream commits through 9a0a1a5 (protocol v3, BYOK models, agent pre-selection, OnEvent, broadcast events)

docs: update version references to 1.0.11

375baac

Merge branch 'public-upstream/public-upstream-main' into edburns/dd-2…

4a51675

…785864-pre-public-non-code-changes # Conflicts: # README.md # jbang-example.java # pom.xml

edburns and others added 24 commits May 26, 2026 12:10

Spotless

8dd9c3c

Fix additional codegen-check problem

63a2dd9

Merge pull request #228 from github/edburns/ghcp-sp-115-java-repackage

5d97719

Edburns/ghcp sp 115 java repackage

Sync with 9017d85 of monorepo

603914c

Add @JsonCreator to AgentMode for JSON round-trip and update @SInCE t…

410c19b

…o 1.1.0 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Merge pull request #230 from github/edburns/sync-with-monorepo

7a2a70b

Add AgentMode enum and plumb agentMode through message send

Initial plan

bb422de

Add unit tests for ToolSet, CopilotClientMode, and PermissionRequestR…

9915058

…esult Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Regenerate codegen output

c4a263d

Auto-committed by codegen-check workflow.

https://github.com/github/copilot-sdk/pull/1465

49e477f

Add CreateSessionReKeyEntryTest to cover session-map re-key cleanup p…

944bae3

…aths Co-authored-by: edburns <75821+edburns@users.noreply.github.com>

Merge pull request #233 from github/edburns/back-sync-from-copilot-sd…

c9c37f8

…k-review Add CreateSessionReKeyEntryTest for session-map re-key cleanup paths

Update URL in package-info.java

dec0bc8

Potential fix for pull request finding

29a0789

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Merge pull request #234 from github/edburns/update-url-in-package-info

7e113aa

Update URL in package-info.java

docs: update version references to 1.0.0-beta-8-java.0

f27263e

Satisfy invariant

3e35b9f

Preserve Java commit history from standalone repo

eff2c19

Copilot AI review requested due to automatic review settings June 3, 2026 00:21

Copilot AI reviewed Jun 3, 2026

View reviewed changes

edburns requested a review from brunoborges June 3, 2026 00:26

brunoborges approved these changes Jun 3, 2026

View reviewed changes

edburns merged commit afbebc7 into main Jun 3, 2026
15 checks passed

edburns deleted the edburns/dd-3011599-preserve-authorship-at-request-of-brunoborges branch June 3, 2026 00:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Preserve Java commit authorship from standalone repo#1561

Preserve Java commit authorship from standalone repo#1561
edburns merged 424 commits into
mainfrom
edburns/dd-3011599-preserve-authorship-at-request-of-brunoborges

edburns commented Jun 3, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

edburns commented Jun 3, 2026

What this does

What this means for reviewers

Verification

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants