Commit 2115b76
Douwe Osinga
Merge origin/main into sources-projects
Pulls in 7 new commits from main:
- #8932 break up acp/server.rs into submodules
- #8924 custom providers UI/ACP
- #8935 keep renamed skills open in detail view
- #8897 skill refactor (CreateSkillDialog -> SkillEditor)
- #8886 copy/content polish
- #8905 Gemini OAuth fix
- #8546 command injection patterns
Conflicts resolved:
- crates/goose/src/acp/server.rs: took main's split structure;
added project-related plumbing (properties, project_id,
include_project_sources) into crates/goose/src/acp/server/sources.rs.
- update_thread_metadata: pub(super) so server/sessions.rs (which
hosts on_update_session_project) can call it.
- ui/goose2/src/features/skills/api/skills.ts: dropped
directoryPath/editable (not on main's SkillInfo); kept our
projectName/projectDir lookup from backend properties.
- ui/goose2/src/features/skills/ui/SkillEditor.tsx (renamed from
CreateSkillDialog.tsx in #8897): kept main's structure; re-added
our save-location picker (Global vs each project) and onSaved
callback.
- ui/goose2/src/shared/i18n/locales/en/skills.json: took main's
casing for editTitle/newTitle; kept our new keys (global,
globalHint, projectHint, saveLocation).
Bumped useChatSessionController.ts file-size limit by 10 lines
(840 -> 850); justification updated to mention ACP project sync.120 files changed
Lines changed: 10155 additions & 3558 deletions
File tree
- .agents/skills/ui-refactor-review
- crates
- goose-cli/src/commands
- goose-sdk/src
- goose-server/src/routes
- goose
- src
- acp
- server
- config
- providers
- security
- tests
- ui
- desktop/src/components/settings/providers/modal
- goose2
- scripts
- src
- features
- agents/ui
- chat
- hooks
- __tests__
- lib
- stores
- ui
- __tests__
- home/ui
- projects/ui
- __tests__
- providers
- api
- hooks
- lib
- ui
- settings/ui
- __tests__
- sidebar/ui/__tests__
- skills
- api
- hooks
- lib
- ui
- __tests__
- tests/e2e
- sdk/src/generated
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2093 | 2093 | | |
2094 | 2094 | | |
2095 | 2095 | | |
2096 | | - | |
| 2096 | + | |
2097 | 2097 | | |
2098 | 2098 | | |
2099 | 2099 | | |
| |||
0 commit comments