Skip to content

Commit 3618c44

Browse files
patnikoCopilot
andcommitted
merge: resolve conflicts with main, document IDisposable patterns
Resolve merge conflicts from main: - dotnet/src/Session.cs: Integrate SetModelAsync, simplified permission cleanup - python/copilot/client.py: Adopt ExceptionGroup-based stop() error handling - python/e2e/test_client.py: Update to ExceptionGroup test pattern Document IDisposable/cleanup patterns across all SDKs: - .NET: Class-level XML docs explain IAsyncDisposable contract, README documents DisconnectAsync + DisposeAsync with await using examples - Python: README documents async with context manager pattern - Node.js: README documents Symbol.asyncDispose / await using pattern - Session persistence guide: Add cross-SDK cleanup pattern comparison table Update new files from main (tool-overrides scenario, streaming fidelity tests) to use disconnect()/Disconnect() instead of destroy()/Destroy(). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents b760022 + 87a54de commit 3618c44

File tree

101 files changed

+6283
-697
lines changed

Some content is hidden

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

101 files changed

+6283
-697
lines changed

.github/aw/actions-lock.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"entries": {
3+
"actions/checkout@v6.0.2": {
4+
"repo": "actions/checkout",
5+
"version": "v6.0.2",
6+
"sha": "de0fac2e4500dabe0009e67214ff5f5447ce83dd"
7+
},
8+
"actions/download-artifact@v8.0.0": {
9+
"repo": "actions/download-artifact",
10+
"version": "v8.0.0",
11+
"sha": "70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3"
12+
},
13+
"actions/github-script@v8": {
14+
"repo": "actions/github-script",
15+
"version": "v8",
16+
"sha": "ed597411d8f924073f98dfc5c65a23a2325f34cd"
17+
},
18+
"actions/upload-artifact@v7.0.0": {
19+
"repo": "actions/upload-artifact",
20+
"version": "v7.0.0",
21+
"sha": "bbbca2ddaa5d8feaa63e36b76fdaad77386f024f"
22+
},
23+
"github/gh-aw/actions/setup@v0.50.5": {
24+
"repo": "github/gh-aw/actions/setup",
25+
"version": "v0.50.5",
26+
"sha": "a7d371cc7e68f270ded0592942424548e05bf1c2"
27+
},
28+
"github/gh-aw/actions/setup@v0.52.1": {
29+
"repo": "github/gh-aw/actions/setup",
30+
"version": "v0.52.1",
31+
"sha": "a86e657586e4ac5f549a790628971ec02f6a4a8f"
32+
}
33+
}
34+
}

.github/dependabot.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,32 @@ updates:
77
- package-ecosystem: 'github-actions'
88
directory: '/'
99
multi-ecosystem-group: 'all'
10+
patterns: ['*']
1011
- package-ecosystem: 'devcontainers'
1112
directory: '/'
1213
multi-ecosystem-group: 'all'
14+
patterns: ['*']
1315
# Node.js dependencies
1416
- package-ecosystem: 'npm'
1517
directory: '/nodejs'
1618
multi-ecosystem-group: 'all'
19+
patterns: ['*']
1720
- package-ecosystem: 'npm'
1821
directory: '/test/harness'
1922
multi-ecosystem-group: 'all'
23+
patterns: ['*']
2024
# Python dependencies
2125
- package-ecosystem: 'pip'
2226
directory: '/python'
2327
multi-ecosystem-group: 'all'
28+
patterns: ['*']
2429
# Go dependencies
2530
- package-ecosystem: 'gomod'
2631
directory: '/go'
2732
multi-ecosystem-group: 'all'
33+
patterns: ['*']
2834
# .NET dependencies
2935
- package-ecosystem: 'nuget'
3036
directory: '/dotnet'
3137
multi-ecosystem-group: 'all'
38+
patterns: ['*']

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
# Install Python dependencies
7878
- name: Install Python dependencies
7979
working-directory: ./python
80-
run: uv sync --locked --all-extras --dev
80+
run: uv sync --all-extras --dev
8181

8282
# Install Go dependencies
8383
- name: Install Go dependencies

0 commit comments

Comments
 (0)