Skip to content

Don't set agent props twice#4872

Merged
DOsinga merged 6 commits intomainfrom
dont-set-agent-props-twice
Oct 1, 2025
Merged

Don't set agent props twice#4872
DOsinga merged 6 commits intomainfrom
dont-set-agent-props-twice

Conversation

@DOsinga
Copy link
Collaborator

@DOsinga DOsinga commented Sep 29, 2025

Had another look at the code we ended up merging and I think we missed a trick; that lock returns the agent to the rest of the code so the way it was, it would always reset the provider and scheduler.

alexhancock
alexhancock approved these changes Sep 29, 2025
View reviewed changes
Copy link
Collaborator

@alexhancock alexhancock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good to me. Perhaps add a test that would have failed before the fix.

crates/goose/src/execution/manager.rs Outdated
match &mode {
SessionExecutionMode::Interactive | SessionExecutionMode::Background => {
debug!("Setting scheduler on agent for session {}", session_id);
agent.set_scheduler(Arc::clone(&self.scheduler)).await;
Copy link
Collaborator

@alexhancock alexhancock Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is existing code but why do we agent.set_scheduler for an interactive session?

Copy link
Collaborator Author

@DOsinga DOsinga Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not a great reason, but goose can create schedules for itself and in order to that, the agent needs to have access to the scheduling service

Copy link
Collaborator

@alexhancock alexhancock Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, ok

@DOsinga
Copy link
Collaborator Author

DOsinga commented Oct 1, 2025

It looks good to me. Perhaps add a test that would have failed before the fix.

I dont think you can really. this is better because it doesn't lock up the entire agent manager while creating an agent, but the previous situation would still work

@DOsinga DOsinga merged commit 601efb2 into main Oct 1, 2025
11 checks passed
@DOsinga DOsinga deleted the dont-set-agent-props-twice branch October 1, 2025 20:27
zanesq added a commit that referenced this pull request Oct 1, 2025
@zanesq
Merge branch 'main' of github.com:block/goose into zane/fix-extension…
5164f56 
…-deeplink

* 'main' of github.com:block/goose: (57 commits)
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  Make token counter safer (#4924)
  Rename Hacktoberfest Blog to Hacktoberfest Content (#4926)
  Include Session ID appropriately in UI (#4901)
  fix mcp integration test flakiness (#4871)
  Add type field to empty schemas for anthropic (#4911)
  docs: remove subagents from experimental (#4907)
  CLI: dont show logs to user (#4902)
  patching the security scanner to redact environment variables (#4908)
  rmcp upgrade (#4792)
  feat: Use the screen, goose (#4905)
  added claude-sonnet-4-5 (#4906)
  Tiny: fix github casing  (#4903)
  remove anyOf from create_task tool (#4897)
  chore(deps): bump tracing-subscriber from 0.3.19 to 0.3.20 (#4442)
  ...
zanesq added a commit that referenced this pull request Oct 1, 2025
@zanesq
Merge branch 'main' of github.com:block/goose into zane/fix-auto-scroll
9a79394 
* 'main' of github.com:block/goose:
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  Make token counter safer (#4924)
  Rename Hacktoberfest Blog to Hacktoberfest Content (#4926)
  Include Session ID appropriately in UI (#4901)
  fix mcp integration test flakiness (#4871)
  Add type field to empty schemas for anthropic (#4911)
  docs: remove subagents from experimental (#4907)
  CLI: dont show logs to user (#4902)
  patching the security scanner to redact environment variables (#4908)
  rmcp upgrade (#4792)
  feat: Use the screen, goose (#4905)

# Conflicts:
#	ui/desktop/src/components/ui/scroll-area.tsx
michaelneale added a commit that referenced this pull request Oct 2, 2025
@michaelneale
Merge branch 'main' into micn/g3
8bc8273 
* main:
  Fix auto scroll to bottom during chat (#4923)
  Fix Typo, Add Description to Hacktoberfest Content Issue Template (#4931)
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  Make token counter safer (#4924)
  Rename Hacktoberfest Blog to Hacktoberfest Content (#4926)
  Include Session ID appropriately in UI (#4901)
  fix mcp integration test flakiness (#4871)
michaelneale added a commit that referenced this pull request Oct 2, 2025
@michaelneale
Merge branch 'main' into micn/tunnel-access
b1fddbf 
* main: (44 commits)
  Add PR template (#4934)
  Using --resume with --name should still accept session IDs (#4937)
  Fix auto scroll to bottom during chat (#4923)
  Fix Typo, Add Description to Hacktoberfest Content Issue Template (#4931)
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  Make token counter safer (#4924)
  Rename Hacktoberfest Blog to Hacktoberfest Content (#4926)
  Include Session ID appropriately in UI (#4901)
  fix mcp integration test flakiness (#4871)
  Add type field to empty schemas for anthropic (#4911)
  docs: remove subagents from experimental (#4907)
  CLI: dont show logs to user (#4902)
  patching the security scanner to redact environment variables (#4908)
  rmcp upgrade (#4792)
  feat: Use the screen, goose (#4905)
  ...
zanesq added a commit that referenced this pull request Oct 2, 2025
@zanesq
Merge branch 'main' of github.com:block/goose into zane/create-recipe…
fe28b24 
…-unification

* 'main' of github.com:block/goose: (24 commits)
  Fix auto scroll to bottom during chat (#4923)
  Fix Typo, Add Description to Hacktoberfest Content Issue Template (#4931)
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  Make token counter safer (#4924)
  Rename Hacktoberfest Blog to Hacktoberfest Content (#4926)
  Include Session ID appropriately in UI (#4901)
  fix mcp integration test flakiness (#4871)
  Add type field to empty schemas for anthropic (#4911)
  docs: remove subagents from experimental (#4907)
  CLI: dont show logs to user (#4902)
  patching the security scanner to redact environment variables (#4908)
  rmcp upgrade (#4792)
  feat: Use the screen, goose (#4905)
  added claude-sonnet-4-5 (#4906)
  Tiny: fix github casing  (#4903)
  ...

# Conflicts:
#	ui/desktop/src/components/BaseChat.tsx
wpfleger96 added a commit to wpfleger96/goose that referenced this pull request Oct 2, 2025
@wpfleger96
Merge branch 'main' into wpfleger/restore-extensions-on-resume
3dc1f3b 
* main: (30 commits)
  feat(nightly): build nightlies from main shas (block#4888)
  Add missing library for fedora/rhel/centos docs (block#4819)
  feat(process): Add GOVERNANCE and MAINTAINERS documents (block#4962)
  Pause test finder, have it run cargo fmt (block#4958)
  Disable the issue comment trigger on pr-comment-bundle (block#4961)
  fix(providers): update Claude Sonnet 4 model identifier (block#4884)
  fix redirect to extensions page after deeplink install and show toast with success message (block#4863)
  Remove wait-for-ready log (block#4956)
  docs: add a new goose tip (block#4940)
  Add PR template (block#4934)
  Using --resume with --name should still accept session IDs (block#4937)
  Fix auto scroll to bottom during chat (block#4923)
  Fix Typo, Add Description to Hacktoberfest Content Issue Template (block#4931)
  Don't set agent props twice (block#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (block#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (block#4913)
  feat: lazy infinite scroller for session history view (block#4922)
  chore: properly identify when to try oauth (block#4918)
  Make token counter safer (block#4924)
  ...
michaelneale added a commit that referenced this pull request Oct 3, 2025
@michaelneale
Merge branch 'main' into micn/live-testing
ad42bd7 
* main: (24 commits)
  Lifei/create save recipe to file (#4895)
  feat(nightly): build nightlies from main shas (#4888)
  Add missing library for fedora/rhel/centos docs (#4819)
  feat(process): Add GOVERNANCE and MAINTAINERS documents (#4962)
  Pause test finder, have it run cargo fmt (#4958)
  Disable the issue comment trigger on pr-comment-bundle (#4961)
  fix(providers): update Claude Sonnet 4 model identifier (#4884)
  fix redirect to extensions page after deeplink install and show toast with success message (#4863)
  Remove wait-for-ready log (#4956)
  docs: add a new goose tip (#4940)
  Add PR template (#4934)
  Using --resume with --name should still accept session IDs (#4937)
  Fix auto scroll to bottom during chat (#4923)
  Fix Typo, Add Description to Hacktoberfest Content Issue Template (#4931)
  Don't set agent props twice (#4872)
  fix: conversation fixer merges assistant text blocks and drops empty text messages (#4898)
  Batch fetch remaining issues for documentation updates
  fix: session timestamps (#4913)
  feat: lazy infinite scroller for session history view (#4922)
  chore: properly identify when to try oauth (#4918)
  ...
HikaruEgashira pushed a commit to HikaruEgashira/goose that referenced this pull request Oct 3, 2025
@DOsinga @HikaruEgashira
Don't set agent props twice (block#4872)
3146d7f 
Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: HikaruEgashira <hikaru-egashira@c-fo.com>
This was referenced Oct 8, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexhancock alexhancock alexhancock approved these changes

@angelahning angelahning angelahning approved these changes

@tlongwell-block tlongwell-block tlongwell-block approved these changes

Assignees

@tlongwell-block tlongwell-block

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@DOsinga @alexhancock @angelahning @tlongwell-block