Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1047 commits
Select commit Hold shift + click to select a range
7097d24
Use ModelInfo, add model caching and selection
sergiou87 Apr 8, 2026
056a59c
Update copilot.tsx
sergiou87 Apr 8, 2026
98e3271
Add feature flag for Copilot merge conflict resolution
tidy-dev Apr 8, 2026
01c29fa
Add conflict context extraction for Copilot merge conflict resolution
tidy-dev Apr 8, 2026
0f4c6c0
Merge pull request #21917 from desktop/tidy-dev/copilot-conflict-reso…
tidy-dev Apr 8, 2026
d96881e
Merge pull request #21914 from desktop/agent-testing-instructions
sergiou87 Apr 8, 2026
0d2c5b6
Merge branch 'development' into copilot-sdk-model-picker
sergiou87 Apr 8, 2026
528c391
Export helpers and add unit tests for Copilot store/UI
sergiou87 Apr 8, 2026
68b99e3
Update SKILL.md
sergiou87 Apr 8, 2026
46ca1ec
Update SKILL.md
sergiou87 Apr 8, 2026
eab5545
Fix inaccurate JSDoc on getPreferredDefaultModel
sergiou87 Apr 8, 2026
1f6a450
Fix heading hierarchy in SKILL.md E2E section
sergiou87 Apr 8, 2026
191a2ed
Add tests for missing default model and stale persisted model
sergiou87 Apr 8, 2026
b14198a
Distinguish loading from empty state in Copilot model picker
sergiou87 Apr 8, 2026
77d6696
Pass selected model ID directly to CopilotStore.generateCommitMessage
sergiou87 Apr 8, 2026
413ca97
Refresh Copilot models automatically on account change
sergiou87 Apr 8, 2026
3bce431
Add commit history and PR body context gathering for conflict resolution
tidy-dev Apr 8, 2026
a837266
Remove GitHub AE references from Enterprise login screen
toddmanion Apr 8, 2026
dd9da0a
Update placeholder to include GitHub Enterprise Server URL
toddmanion Apr 8, 2026
c623766
Revert placeholder to shorter text
toddmanion Apr 8, 2026
dfd26fd
build(deps): bump fast-xml-parser from 4.5.4 to 4.5.6
dependabot[bot] Apr 9, 2026
cb5bc0b
Merge pull request #21926 from toddmanion/fix/remove-ae-references
sergiou87 Apr 9, 2026
cd1502d
Merge pull request #21927 from desktop/dependabot/npm_and_yarn/fast-x…
sergiou87 Apr 9, 2026
ebf684e
Use highly optimized matches() method from re2js in v2
le0pard Apr 8, 2026
90affe4
Fix getCachedModels JSDoc to match actual behavior
sergiou87 Apr 9, 2026
0d1d833
Fix nullable copilotModels guard in SKILL.md example snippet
sergiou87 Apr 9, 2026
a20ffe6
Gate Copilot settings tab on enableCopilotSdkCommitMessageGeneration
sergiou87 Apr 9, 2026
e59b197
Bump Copilot SDK to version 0.2.1
sergiou87 Apr 9, 2026
7af42ca
Use `COPILOT_RUN_APP` to run Copilot
sergiou87 Apr 9, 2026
a83176a
Merge pull request #21881 from desktop/improve-custom-shell-launch
sergiou87 Apr 9, 2026
fcc937d
Fix Copilot CLI import on Windows
sergiou87 Apr 9, 2026
314d77f
Use pathToFileURL for Windows import path
sergiou87 Apr 9, 2026
cbe0131
Merge pull request #21930 from desktop/update-copilot-sdk
sergiou87 Apr 9, 2026
56f5051
Merge pull request #21924 from le0pard/re2js-update-imprv
tidy-dev Apr 9, 2026
9899332
Route preferAbsoluteDates through AppStore/Dispatcher
niik Apr 2, 2026
e6b90d7
Update appearance.tsx
niik Apr 13, 2026
45d425f
lint
niik Apr 13, 2026
d6c9c39
Merge pull request #21836 from desktop/formatting-preferences
niik Apr 13, 2026
3520aef
Bump webpack from 5.94.0 to 5.104.1
dependabot[bot] Apr 13, 2026
5b3a02f
Merge pull request #21581 from desktop/dependabot/npm_and_yarn/webpac…
sergiou87 Apr 13, 2026
e284d6a
Merge branch 'development' into copilot-sdk-model-picker
sergiou87 Apr 14, 2026
70f2081
Merge pull request #21916 from remlapmot/fix-typo
niik Apr 14, 2026
251b787
Improve pitch label management in triage workflows
tidy-dev Apr 14, 2026
8e5defe
Fix lint issues
sergiou87 Apr 14, 2026
ac51f9a
Migrate CopilotStore to BaseStore
sergiou87 Apr 14, 2026
6775740
Merge pull request #21955 from desktop/tidy-dev/pitch-label-workflow-…
tidy-dev Apr 14, 2026
9d3e26e
Update Git for Windows to v2.53.0.windows.3
tidy-dev Apr 14, 2026
c04da94
Apply suggestion from @tidy-dev
tidy-dev Apr 14, 2026
10970b3
Merge pull request #21957 from desktop/update-dugite-v3.2.2
tidy-dev Apr 14, 2026
5605c16
Merge pull request #21957 from desktop/update-dugite-v3.2.2
tidy-dev Apr 14, 2026
b1d863a
Draft release 3.5.8
tidy-dev Apr 14, 2026
2a8f24e
Fix beta draft release: use JSON output and compare from last beta tag
tidy-dev Apr 14, 2026
fabbe4f
Merge pull request #21959 from desktop/releases/3.5.8
tidy-dev Apr 14, 2026
1bc2b44
Address review feedback: improve error handling and JSDoc
tidy-dev Apr 14, 2026
e3a3026
Fix formatting with prettier
tidy-dev Apr 14, 2026
4546b4e
Merge pull request #21961 from desktop/fix-draft-release-beta-notes
tidy-dev Apr 14, 2026
212c822
Update release notes instructions: skip dependabot, include Git updat…
tidy-dev Apr 14, 2026
cbdf788
Use app token for release branch push to trigger release-pr.yml
tidy-dev Apr 14, 2026
e4e9708
Use actions/create-github-app-token instead of tibdex/github-app-token
tidy-dev Apr 14, 2026
1ff5a50
Move app token before branch creation and consolidate into single step
tidy-dev Apr 14, 2026
7fdb167
Use app token in checkout instead of setting remote URL manually
tidy-dev Apr 14, 2026
2109574
Merge pull request #21964 from desktop/fix-draft-release-bot-token
tidy-dev Apr 14, 2026
9da4179
Run prettier on changelog.json in draft-release workflow
tidy-dev Apr 14, 2026
58955d9
Merge pull request #21966 from desktop/fix-draft-release-bot-token
tidy-dev Apr 15, 2026
e731e72
Draft release 3.5.9-beta1
github-actions[bot] Apr 15, 2026
de0185e
Apply suggestion from @tidy-dev
tidy-dev Apr 15, 2026
2cade0d
Support per-feature Copilot model selections
sergiou87 Apr 15, 2026
dbbb5dd
Use delete to remove copilot model key
sergiou87 Apr 15, 2026
9969f9b
Bump dompurify from 3.3.2 to 3.4.0 in /app
dependabot[bot] Apr 16, 2026
e70411f
Merge pull request #21971 from desktop/dependabot/npm_and_yarn/app/do…
niik Apr 16, 2026
4616f27
Merge pull request #21968 from desktop/releases/3.5.9-beta1
tidy-dev Apr 16, 2026
0a420c3
Don't allow using any tools when generating a commit message
sergiou87 Apr 16, 2026
ea1aced
Add minimum width to release notes dialog
DylanDevelops Apr 16, 2026
c8b4da2
Fix spacing
DylanDevelops Apr 16, 2026
f4401e8
Fixed svg overlap with version number
DylanDevelops Apr 16, 2026
9546f44
Merge pull request #21745 from desktop/copilot-sdk-model-picker
sergiou87 Apr 17, 2026
984177f
Merge pull request #21976 from DylanDevelops/ravel/fix-changelog-spacing
niik Apr 17, 2026
94eba08
Merge pull request #21974 from desktop/tighten-copilot-available-tools
sergiou87 Apr 17, 2026
5fdd5a6
Fix Windows scrollbar sync with react-virtualized Grid
niik Apr 17, 2026
e108315
feat: .astro 파일 문법 하이라이팅 추가
JunDev76 Apr 20, 2026
858902d
Upgrade react-virtualized from 9.20.0 to 9.22.6
niik Apr 21, 2026
3c9ab1d
Merge pull request #21981 from desktop/fix-windows-list-scroll-sync
niik Apr 21, 2026
3cf6aa3
Parse structured Copilot 402 billing errors
sergiou87 Mar 31, 2026
e48b385
Differentiate Copilot billing error dialogs
sergiou87 Mar 31, 2026
246f271
Merge pull request #21817 from aruddick-copia/disposable-types
niik Apr 21, 2026
ec14900
Please linter
sergiou87 Apr 21, 2026
e741a51
Fix lint error again
sergiou87 Apr 21, 2026
955a704
Merge pull request #21995 from desktop/improve-copilot-error-messages
sergiou87 Apr 21, 2026
609ee43
Simplify conflict context module for all conflict types
tidy-dev Apr 21, 2026
49c15c5
Fix CRLF parsing, prompt safety, path traversal, and context bleeding
tidy-dev Apr 21, 2026
8a08fa3
Use resolveWithin for cross-platform path traversal guard
tidy-dev Apr 21, 2026
7455d14
Harden buildConflictContext and prompt formatting
tidy-dev Apr 21, 2026
d5291f0
Require whitespace or EOL after conflict marker characters
tidy-dev Apr 21, 2026
32e6980
Use Commit model directly in conflict commit context
tidy-dev Apr 21, 2026
a0f11b3
Move interfaces to top and parallelize file reading
tidy-dev Apr 21, 2026
1b8a0a7
Streamline tests: remove redundant, merge related, add edge cases
tidy-dev Apr 21, 2026
85407b6
Fix MAX_CONFLICT_FILE_SIZE comment: bytes not characters
tidy-dev Apr 21, 2026
99c9dff
Track skipped files with reasons instead of silently dropping them
tidy-dev Apr 21, 2026
c37bf5b
Fix Prettier formatting
tidy-dev Apr 21, 2026
e8665f4
Merge pull request #21988 from JunDev76/add-astro-syntax-highlighting
tidy-dev Apr 21, 2026
3d19e39
Bump app version to 3.5.9-beta2
sergiou87 Apr 22, 2026
9882ccb
Merge pull request #21996 from desktop/releases/3.5.9-beta2
sergiou87 Apr 22, 2026
631c8c1
Add Copilot conflict resolution engine
tidy-dev Apr 8, 2026
683cd59
Remove confidence levels from conflict resolution
tidy-dev Apr 9, 2026
df9df5e
Disable SDK tools for conflict resolution sessions
tidy-dev Apr 13, 2026
c75024d
Update conflict resolution engine with batching, retry, all conflict …
tidy-dev Apr 22, 2026
fb3738d
Remove stats tracking from conflict resolution engine
tidy-dev Apr 22, 2026
96b6784
Merge remote-tracking branch 'origin/development' into tidy-dev/unpen…
tidy-dev Apr 22, 2026
89ac434
Remove stats-database and stats-store conflict resolution counters
tidy-dev Apr 22, 2026
6cfb496
Align conflict resolution engine with benchmark findings
tidy-dev Apr 22, 2026
ba1aa06
Extract getConflictLabelsAndRefs helper for conflict type handling
tidy-dev Apr 22, 2026
ebdde16
Use assertNever for unknown conflict types, add log warnings for empt…
tidy-dev Apr 22, 2026
24dbbca
Fix chunk size comment to reflect actual rationale
tidy-dev Apr 22, 2026
c20b599
Fix validation gaps and add conflict resolution tests
tidy-dev Apr 22, 2026
3786bb6
Address adversarial review: 6 fixes and 11 new tests
tidy-dev Apr 22, 2026
8e929b0
Fix R3 review: regex multi-block, truncated markers, path trimming
tidy-dev Apr 22, 2026
120cd3f
Simplify over-abstractions in conflict resolution engine
tidy-dev Apr 22, 2026
8ef5564
Merge pull request #21920 from desktop/tidy-dev/fossillike-cleta
tidy-dev Apr 23, 2026
f78feaa
chore(deps): upgrade @github/copilot-sdk to ^0.2.2
sergiou87 Apr 17, 2026
d6c137d
First approach to BYOK
sergiou87 Apr 20, 2026
9d331d3
Add styling for Copilot BYOK preferences and dialog
sergiou87 Apr 20, 2026
588181d
Polish Copilot BYOK provider list
sergiou87 Apr 20, 2026
a62554a
Polish Copilot BYOK provider dialog
sergiou87 Apr 20, 2026
6175ed6
Confirm before removing a Copilot BYOK provider
sergiou87 Apr 20, 2026
4175c25
Show model row labels only on the first row
sergiou87 Apr 20, 2026
df99534
Refine BYOK preferences UI
sergiou87 Apr 20, 2026
9a321ab
Truncate long names and subtitles in BYOK provider list
sergiou87 Apr 20, 2026
b51952b
Constrain BYOK provider rows to the dialog width
sergiou87 Apr 20, 2026
fe5377c
Allow Settings tab content to shrink below its content width
sergiou87 Apr 20, 2026
0a05876
Friendlier model list in the BYOK provider dialog
sergiou87 Apr 20, 2026
6d6165f
Store per-model reasoning effort instead of a boolean
sergiou87 Apr 20, 2026
3a360b7
Edit BYOK models in a dedicated dialog
sergiou87 Apr 20, 2026
5e2f1ee
Push BYOK model dialog onto the popup stack and tidy field spacing
sergiou87 Apr 20, 2026
7dc8f2e
Rename to 'Reasoning effort' and default to provider behavior
sergiou87 Apr 20, 2026
149ae85
Match BYOK 'Add model' button styling to other Add buttons
sergiou87 Apr 20, 2026
d066a6f
Decouple BYOK 'Local' badge from authentication
sergiou87 Apr 20, 2026
e7d66e5
Drop redundant Authentication legend in BYOK provider dialog
sergiou87 Apr 20, 2026
e9547e6
Cap BYOK provider/model lists with an inner scroll
sergiou87 Apr 20, 2026
41fadb7
Cap Copilot Preferences height and rename BYOK list classes
sergiou87 Apr 20, 2026
18775b9
Scroll the whole Copilot tab instead of the BYOK list
sergiou87 Apr 20, 2026
67fe768
Remove testing code
sergiou87 Apr 20, 2026
c9ad368
Split Copilot preferences into Models and Providers tabs
sergiou87 Apr 20, 2026
785aa0b
Mirror git tab padding pattern in Copilot preferences
sergiou87 Apr 20, 2026
f09d019
Update copilot.tsx
sergiou87 Apr 20, 2026
530ecd6
Add minimal-changes guideline to conflict resolution prompt
tidy-dev Apr 23, 2026
c234b93
Update tests with latest strings
sergiou87 Apr 23, 2026
3cd0d75
Use "Retry: " prefix constant for retryable errors
tidy-dev Apr 23, 2026
b904284
Use CopilotValidationError class for retryable errors
tidy-dev Apr 23, 2026
049c435
Merge remote-tracking branch 'origin/development' into tidy-dev/unpen…
tidy-dev Apr 23, 2026
95ce870
Remove unused `maxContextWindowTokens` propery
sergiou87 Apr 23, 2026
eeb271a
Replace isRecord with lodash/isPlainObject
tidy-dev Apr 23, 2026
25fca5b
Require BYOK secret on auth-kind change in edit dialog
sergiou87 Apr 23, 2026
7aa8b23
Validate BYOK baseUrl scheme in localStorage loader
sergiou87 Apr 23, 2026
65b2ad8
Apply BYOK keychain change before persisting provider list
sergiou87 Apr 23, 2026
27abefa
Fail BYOK request when no credential is stored for the provider
sergiou87 Apr 23, 2026
2e1efbf
Surface keychain failures when resolving a BYOK selection
sergiou87 Apr 23, 2026
b643e78
Scrub stale BYOK selections when Preferences saves model picks
sergiou87 Apr 23, 2026
4ec1d7a
Recognise more loopback addresses as 'Local' BYOK providers
sergiou87 Apr 23, 2026
9ac3d18
Tailor BYOK delete confirmation message to the provider's authKind
sergiou87 Apr 23, 2026
94c343b
Move conflict resolution domain logic out of copilot-store
tidy-dev Apr 23, 2026
5ac491c
Add unit tests for BYOK URL, loopback, and secret-rule helpers
sergiou87 Apr 23, 2026
a84931b
Reorder copilot-conflict-resolution.ts: types and constants first
tidy-dev Apr 23, 2026
a8cad09
Remove legacy BYOK reasoningEffort migration
sergiou87 Apr 23, 2026
61d55ce
Fix type narrowing after isPlainObject checks
tidy-dev Apr 23, 2026
078a847
Revert copilot-commit-message.ts to development version
tidy-dev Apr 23, 2026
6af917b
Normalize LLM-returned paths in parser
tidy-dev Apr 23, 2026
50beaf0
Fix OS command injection in getAppBundleID via execFile
st4rain Apr 24, 2026
4a24f4c
Skip branches checked out in linked worktrees during pruning
KRRT7 Apr 24, 2026
726ba4a
Filter blank model IDs when saving BYOK provider
sergiou87 Apr 24, 2026
9ded00f
Fix misleading comment on BYOK dialog secret state field
sergiou87 Apr 24, 2026
98ae09f
Move orphaned JSDoc back above isLocalBaseUrl
sergiou87 Apr 24, 2026
64fc42d
Validate optional wireApi/azureApiVersion in isBYOKProvider
sergiou87 Apr 24, 2026
5b18cd0
Drop stale Copilot model selections after fetching model list
sergiou87 Apr 24, 2026
e762bb3
Merge pull request #22002 from st4rain/development
niik Apr 24, 2026
14e0157
Merge pull request #21992 from desktop/bump-react-virtualized
niik Apr 24, 2026
6e61a84
Use descriptive keychain entry name for BYOK secrets
sergiou87 Apr 27, 2026
48ed109
Tighten loopback detection in isLocalBaseUrl
sergiou87 Apr 27, 2026
4a8a44a
Restrict http BYOK base URLs to loopback
sergiou87 Apr 27, 2026
a4243a9
Surface keychain errors when saving BYOK providers
sergiou87 Apr 27, 2026
0782924
Distinguish unknown Copilot model list from empty list
sergiou87 Apr 27, 2026
616f52c
Append repo commit rules to Copilot prompt
sergiou87 Apr 24, 2026
81ca03c
Include repo rules in Copilot commit prompt
sergiou87 Apr 24, 2026
7f3c4ab
Defensive copy in RepoRulesMetadataRules.getRules
sergiou87 Apr 27, 2026
048fae9
Move repo commit-message rules into delimited user prompt
sergiou87 Apr 27, 2026
81c2111
Merge pull request #22000 from desktop/copilot-sdk-byok
sergiou87 Apr 27, 2026
9dda80e
Bump postcss from 8.4.41 to 8.5.12
dependabot[bot] Apr 27, 2026
d98924c
Guard repo rules lookup with optional chaining
sergiou87 Apr 28, 2026
1a11e05
Correct JSDoc for generateCommitMessage repo rules param
sergiou87 Apr 28, 2026
166c5e5
Compute cleaned commit-message rules once in generateCommitMessage
sergiou87 Apr 28, 2026
ba3a967
Select first available Copilot model by default
sergiou87 Apr 29, 2026
e8ac7fa
Merge pull request #22014 from desktop/dependabot/npm_and_yarn/postcs…
tidy-dev Apr 29, 2026
e203009
Enable extended PR screening for external PRs
tidy-dev Apr 29, 2026
9851515
Update CopilotPreferences tests for model keys & fallbacks
sergiou87 Apr 29, 2026
daf21b9
Please linter
sergiou87 Apr 29, 2026
c11d6a4
Merge pull request #22007 from desktop/copilot-repo-rules
sergiou87 Apr 29, 2026
e6c50fb
Merge pull request #22025 from desktop/no-copilot-Default-option
sergiou87 Apr 30, 2026
112062e
Merge pull request #21921 from desktop/tidy-dev/unpending-emelda
tidy-dev May 1, 2026
ed7e09d
Merge pull request #22027 from desktop/enable-pr-screening
tidy-dev May 4, 2026
f6536a9
Add 'Resolve with Copilot' button to conflicts dialog
tidy-dev May 4, 2026
79b4c02
Add Copilot customization hints to preferences UI
sergiou87 Apr 30, 2026
ebeec70
Refactor Copilot prefs UI and styles
sergiou87 May 4, 2026
1a1acd6
Fix emitUpdate context when resolving models
sergiou87 May 4, 2026
bc9ed2c
Refine Copilot preferences wording
sergiou87 May 4, 2026
12a073f
Drop dead code styling from Copilot hints
sergiou87 May 4, 2026
dac8620
Unify settings description styling under .settings-description
sergiou87 May 4, 2026
1cfeaea
Drop redundant comment on .copilot-feature-hint
sergiou87 May 4, 2026
87a116a
Merge pull request #22063 from desktop/copilot-custom-instructions
sergiou87 May 4, 2026
203bd43
Merge pull request #22061 from desktop/tidy-dev/copilot-conflicts-ent…
tidy-dev May 4, 2026
eb7fdb9
Add Copilot conflict resolution step kinds and state flag
tidy-dev May 4, 2026
296c624
Use secondary text color for commit controls
sergiou87 May 5, 2026
04d6122
Prevent hover styles on disabled commit buttons
sergiou87 May 5, 2026
ba150f8
Bump Copilot SDK and update CopilotStore fields
sergiou87 May 5, 2026
b3950aa
Merge pull request #22062 from desktop/tidy-dev/copilot-conflicts-steps
tidy-dev May 6, 2026
b087fbe
Add Copilot conflicts loading interstitial and state transition
tidy-dev May 4, 2026
024f08d
Merge pull request #22075 from desktop/fix-commit-message-buttons-style
sergiou87 May 6, 2026
3578849
Merge pull request #22066 from desktop/tidy-dev/copilot-conflicts-loa…
tidy-dev May 6, 2026
b20a987
Add Copilot conflicts dialog scaffold
tidy-dev May 4, 2026
34f4884
Potential fix for pull request finding
tidy-dev May 4, 2026
598367a
Potential fix for pull request finding
tidy-dev May 4, 2026
c575225
Fix setCopilotConflictResolution → use Dispatcher method
tidy-dev May 4, 2026
5c1b201
Merge pull request #22071 from desktop/tidy-dev/copilot-conflicts-dia…
tidy-dev May 6, 2026
679a93c
Wire up end-to-end Copilot conflict resolution flow
tidy-dev May 4, 2026
5c162ae
Defer file writes until user confirms Copilot resolutions
tidy-dev May 4, 2026
06114c2
Show resolution progress in loading interstitial
tidy-dev May 4, 2026
6edfcc3
Fix prettier formatting
tidy-dev May 4, 2026
4244551
Address PR review feedback
tidy-dev May 5, 2026
af0a68b
Merge pull request #22076 from desktop/bump-copilot-sdk-1-beta
sergiou87 May 6, 2026
8947596
Bump ip-address from 10.0.1 to 10.2.0
dependabot[bot] May 6, 2026
f6d0ef3
Merge pull request #22072 from desktop/tidy-dev/tidy-dev-copilot-conf…
tidy-dev May 6, 2026
7a44bd6
Polish Copilot conflicts dialog with per-file resolutions and actions
tidy-dev May 5, 2026
f5c5f90
Fix resolution dropdown not updating in Copilot conflicts dialog
tidy-dev May 5, 2026
89986c5
Auto-route to Copilot resolution on subsequent conflict rounds
tidy-dev May 5, 2026
6600b98
Fix frozen dialog on error and memoize click handlers
tidy-dev May 5, 2026
d8ce9ad
Fix abort button, return-to-conflicts, and stale state bugs
tidy-dev May 5, 2026
0c2371a
Handle Copilot 402 session errors and tests
sergiou87 May 7, 2026
2499bd5
Bump fast-uri from 3.1.0 to 3.1.2
dependabot[bot] May 9, 2026
f1b0574
Merge pull request #22078 from desktop/tidy-dev/functional-manual-con…
tidy-dev May 11, 2026
26c3ad1
Constrain Copilot preferences dialog height
sergiou87 May 11, 2026
a5b1ace
Merge remote-tracking branch 'origin/development' into pr/22004
niik May 11, 2026
27e99c5
Use -z flag for null-delimited worktree list output
niik May 11, 2026
40b21eb
Include main worktree branch in getWorktreeCheckedOutBranches
niik May 11, 2026
1e26db0
Merge pull request #22004 from KRRT7/fix/branch-pruner-worktree-safety
niik May 11, 2026
fe54ec7
Merge pull request #22101 from desktop/fix-copilot-settings-max-height
sergiou87 May 11, 2026
30e9163
Update app/src/lib/stores/copilot-store.ts
sergiou87 May 11, 2026
5b936bf
Fix syntax error
sergiou87 May 11, 2026
f375698
Merge pull request #22086 from desktop/track-copilot-sdk-errors
sergiou87 May 11, 2026
e9cc945
Bump Node and Electron to 24.15 / 42.0.1
sergiou87 May 11, 2026
d143064
Merge pull request #22104 from desktop/bump-electron-v42
sergiou87 May 11, 2026
46a4793
Merge pull request #22079 from desktop/dependabot/npm_and_yarn/ip-add…
sergiou87 May 11, 2026
abb0f74
Merge pull request #22090 from desktop/dependabot/npm_and_yarn/fast-u…
sergiou87 May 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ overrides:
- files: 'app/test/**/*'
rules:
'@typescript-eslint/no-non-null-assertion': off
react/jsx-no-bind: off
- files: 'script/**/*'
rules:
'@typescript-eslint/no-non-null-assertion': off
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Automatically request review from desktop/code-reviewers on all PRs
* @desktop/code-reviewers
39 changes: 39 additions & 0 deletions .github/actions/setup-ci-environment/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Setup CI Environment
description: Set up Python, Node.js, optional ffmpeg, and install dependencies.

inputs:
node-version:
description: Node.js version to use.
required: true
arch:
description: Target architecture for dependency installation.
required: true
install-ffmpeg:
description: Whether to install ffmpeg on Windows.
required: false
default: 'false'

runs:
using: composite
steps:
- uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: yarn

- name: Install ffmpeg
if: ${{ runner.os == 'Windows' && inputs.install-ffmpeg == 'true' }}
shell: bash
run: choco install ffmpeg --yes --no-progress

- name: Install and build dependencies
shell: bash
run: yarn
env:
npm_config_arch: ${{ inputs.arch }}
TARGET_ARCH: ${{ inputs.arch }}
35 changes: 35 additions & 0 deletions .github/actions/setup-windows-signing/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Setup Windows Signing
description: Install Azure Code Signing prerequisites and authenticate.

inputs:
enabled:
description: Whether Windows signing setup should run.
required: false
default: 'false'
azure-client-id:
description: Azure Code Signing client ID.
required: false
azure-tenant-id:
description: Azure Code Signing tenant ID.
required: false

runs:
using: composite
steps:
- name: Install Azure Code Signing Client
if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
shell: pwsh
run: |
$acsZip = Join-Path $env:RUNNER_TEMP "acs.zip"
$acsDir = Join-Path $env:RUNNER_TEMP "acs"
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.95 -OutFile $acsZip -Verbose
Expand-Archive $acsZip -Destination $acsDir -Force -Verbose
Copy-Item -Path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\*" -Include signtool.exe,signtool.exe.manifest,Microsoft.Windows.Build.Signing.mssign32.dll.manifest,mssign32.dll,Microsoft.Windows.Build.Signing.wintrust.dll.manifest,wintrust.dll,Microsoft.Windows.Build.Appx.AppxSip.dll.manifest,AppxSip.dll,Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest,AppxPackaging.dll,Microsoft.Windows.Build.Appx.OpcServices.dll.manifest,OpcServices.dll -Destination "node_modules\electron-winstaller\vendor" -Verbose

- name: Azure Login (OIDC)
if: ${{ runner.os == 'Windows' && inputs.enabled == 'true' }}
uses: azure/login@v2
with:
client-id: ${{ inputs.azure-client-id }}
tenant-id: ${{ inputs.azure-tenant-id }}
allow-no-subscriptions: true
Loading