Repository navigation
You choose the OpenAI model; desktop cherry-picks and reverts merge commits - #154
Merged
Merged
Conversation
…hich side A cherry-pick or revert of one merge commit used to be refused, naming `git cherry-pick -m 1` to run from a terminal; the extension asks. Now main answers such a request with the merge's parents (`mergeSides`), and the bridge asks which side — once, for every door, in the extension's words — then sends the same request again with `mainline` (-m). Every parent of an octopus merge is offered; a mainline that is not one of them is refused, never guessed at. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… product The extension's OpenAI model settings defaulted to gpt-4o-mini / gpt-4o and the AI panel's OpenAI card came filled with gpt-4o; the desktop's OpenAI and Azure presets seeded models too. Now they are blank: the model field lists what your key can use, Connect asks for one, and a detected list is offered, never picked from (it took the first, alphabetically). A setup already running on the old extension defaults keeps them, written once as its own values, so nothing switches off on update. The desktop no longer swaps a retired OpenAI default for you, and never moves a tier onto a blank. The model you pick is spoken to properly: OpenAI's reasoning ids (o-series, gpt-5 and later) get max_completion_tokens and low reasoning effort — they answered the extension's max_tokens with HTTP 400. One helper, shared with the desktop's provider, in @gitstudio/engine/ai/aiCore. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two follow-ups from the 1.24.0 / 2.9.0 release.
You choose the OpenAI model (extension + desktop)
gitstudio.ai.openai.model*default to blank (were gpt-4o-mini / gpt-4o); the AI panel's OpenAI card no longer comes filled with gpt-4o; Connect asks for a model; a detected/modelslist is offered, filled in only when it has a single entry (it took the first — alphabeticallybabbage-002).ai:models; the add toast says what's left ("…and choose a model"). No retired OpenAI default is swapped for you any more, andmigrateRetiredModelsnever moves a tier onto a blank.max_completion_tokens+reasoning_effort: lowinstead ofmax_tokens(HTTP 400). Shared helper moved to@gitstudio/engine/ai/aiCore.Desktop: cherry-pick / revert a merge commit
mergeSides), the bridge asks which side (the extension's words, every parent of an octopus offered) and resends withmainline→-m N. Invalid mainline refused.Tests:
apps/extension/test/aiChooseModel.test.ts(defaults, panel in headless Chrome, keep-former-defaults, wire body),packages/ai/test/retiredDefaults.test.ts,apps/desktop/test/mergeSideBridge.test.ts, real-git cases ingitBridge.ops.test.ts, harness checksa-merge-cherry-pick-…/a-merge-revert-….npm run verifygreen locally. 13 locales translated.🤖 Generated with Claude Code