Skip to content

Commit 2115b76

Browse files
author
Douwe Osinga
committed
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.
2 parents 2533f35 + 43478a2 commit 2115b76

120 files changed

Lines changed: 10155 additions & 3558 deletions

File tree

Some content is hidden

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

.agents/skills/ui-refactor-review/SKILL.md

Lines changed: 0 additions & 250 deletions
This file was deleted.

crates/goose-cli/src/commands/configure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2093,7 +2093,7 @@ fn add_provider() -> anyhow::Result<()> {
20932093
engine: provider_type.to_string(),
20942094
display_name: display_name.clone(),
20952095
api_url,
2096-
api_key,
2096+
api_key: requires_auth.then_some(api_key),
20972097
models,
20982098
supports_streaming: Some(supports_streaming),
20992099
headers,

0 commit comments

Comments
 (0)