feat: persist GooseMode per-session via session DB by codefromthecrypt · Pull Request #7854 · block/goose

codefromthecrypt · 2026-03-13T08:41:51Z

Summary

GooseMode is read from global config everywhere: agents, providers, system prompts, get_tools. Switching mode in the UI writes config but nothing persists it to the session, so reloading a session loses the mode. Providers bake permission flags at spawn time and never update. The mode selector looks dynamic but the actual permission behavior is inconsistent.

This change makes mode per-session, mutable and persistent:

Session DB (schema v8): goose_mode column on sessions table. create_session accepts a mode; get_session restores it. SessionUpdateBuilder::goose_mode() for runtime changes.
Server: /agent/update_session accepts goose_mode, persists to DB, and calls Agent::update_goose_mode which propagates to the provider via Provider::update_mode().
Agent: current_goose_mode mutex replaces global config reads. update_goose_mode() updates the mutex, calls provider.update_mode(), and persists to DB. System prompts and tool listings read the session-scoped mode.
UI: BottomMenuModeSelection fetches mode from session API and writes only to session DB. It does not write global config. To change the default for new sessions, use settings or goose configure.

Providers

Provider::update_mode() propagates mode on initial attachment and runtime changes:

Claude Code: rejects mid-session mode changes (mode baked at subprocess spawn; claude-acp replaces this provider, feat(acp): add session/set_mode handler #7801).
Codex: fresh subprocess per turn. update_mode() stores session_id to mode in a map; apply_permission_flags reads from it.
Ollama: removed redundant Chat-mode tool filter. The agent already skips tool calls in Chat mode.
ACP: session/set_mode handler persists mode per-session. on_load_session restores it from DB.

Subagents beware

Subagents (summon.rs) must use Auto until get_agent_messages forwards ActionRequired messages to the parent.
Until then, any mode that requires approval will hang on the subagent's confirmation_rx.
This is the same as current, but should be refactored to work once this is merged.

Type of Change

Feature
Bug fix
Refactor / Code quality
Tests

AI Assistance

This PR was created or reviewed with AI assistance

Testing

Goose UI

Kill goose and clear session state:

$ pkill -f goose
$ rm -rf ~/.local/state/goose/logs ~/.local/share/goose/sessions

Run the UI

$ just run-ui

Test Mode durability:

Start a new session, send any message (e.g. hello)
Switch mode to "approve" via bottom bar mode selector
Kill the goose process: pkill -f goose
Restart: just run-ui
Load the previous session from the session list
Bottom bar mode selector should show "manual" (approve), not "autonomous" (auto)
Prompt: what is in /tmp. The developer extension tries to run a shell command and a permission dialog appears (proves approve mode is enforced, not just displayed)
Approve the permission; command executes and returns results

Test mode persistence across provider swap:

Start a new session, send any message
Switch mode to "approve" via bottom bar mode selector
Open Settings and switch the provider/model (this calls /agent/update_provider)
Bottom bar mode selector should still show "manual" (approve)
Prompt: what is in /tmp. Permission dialog should appear (proves mode survived provider swap)

Test multi-session mode isolation:

Start session A, switch mode to "approve"
Open a new session B (should default to "auto")
Switch back to session A
Bottom bar should show "manual" (approve), not "autonomous" (auto)

Zed (ACP)

Kill goose and clear state:

$ pkill -f goose
$ rm -rf ~/.local/state/goose/logs ~/.local/share/goose/sessions
$ rm -rf ~/Library/Logs/Zed/ ~/Library/Application\ Support/Zed/threads/

Build and configure:

$ just release-binary

Add to ~/.config/zed/settings.json:

"agent_servers": {
"goose": {
"type": "custom",
"command": "/path/to/goose/target/release/goose",
"args": ["acp", "--with-builtin", "developer"],
"env": { "RUST_LOG": "debug" }
}
}

Mode selection:

Open Zed's agent panel. The mode selector (bottom bar, next to model selector) shows "auto" as the default.

Click the mode selector
Switch to "approve"
Enter "hello" and send it.
Close and reopen.
Under Recent, click "User greeting"
you should see the mode is still "approve"

Related Issues

Fixes #7603
Alternate to #7606

Screenshots

Goose UI

Zed

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9b6b359c24

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/agents/agent.rs

ui/desktop/src/App.tsx

crates/goose/src/providers/claude_code.rs

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9b1a294437

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/providers/codex.rs

crates/goose/src/agents/agent.rs

codefromthecrypt · 2026-03-13T12:05:02Z

going to wire in ACP now

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 71132682cd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/providers/claude_code.rs

crates/goose-server/src/routes/agent.rs

codefromthecrypt · 2026-03-13T13:00:10Z

ACP is wired in and added screenshots of Zed. any pushes to this branch are welcome as needed @jh-block or you can tell me to follow-up but I am limited availability as in transit Monday

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ddf4b08fe3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/agents/agent.rs

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d529590a53

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/providers/codex.rs

ui/desktop/src/components/BaseChat.tsx

codefromthecrypt · 2026-03-14T02:14:36Z

ok done working on this, any new copilot things I don't have time for

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fcd1c43159

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/agents/agent.rs

ui/desktop/src/components/bottom_menu/BottomMenuModeSelection.tsx

Signed-off-by: Adrian Cole <adrian@tetrate.io>

Propagate session mode to new provider after swap in update_agent_provider. Remove BaseChat useEffect that wrote every sessions mode to global config, causing multi-session stomping. BottomMenuModeSelection now fetches mode from session API and writes only to session DB. Signed-off-by: Adrian Cole <adrian@tetrate.io>

Signed-off-by: Adrian Cole <adrian@tetrate.io>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0485ef9310

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/providers/codex.rs

ui/desktop/src/components/bottom_menu/BottomMenuModeSelection.tsx

Signed-off-by: Adrian Cole <adrian@tetrate.io>

codefromthecrypt · 2026-03-16T00:17:16Z

ok I had some time to feed the bot again, but I'm out of it again.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 586d668cf2

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

crates/goose/src/providers/codex.rs

…oken-retry * origin/main: (21 commits) Remove java/.ai-usage-marker directory (#7925) test(acp): add terminal delegation fixtures and fix shell singleton (#7923) fix: bump pctx_code_mode to 0.3.0 for iterator type checking fix (#7892) feat: persist GooseMode per-session via session DB (#7854) feat(otel): propagate session.id to spans and log records (#7490) fix(test): add env_lock to is_openai_reasoning_model tests (#7917) fix(acp): pass session_id when loading extensions so skills are discovered (#7868) updated canonical models (#7920) feat(autovisualiser): Migrate the autovisualiser extension to MCP Apps (#7852) fix: add tool_choice and parallel_tool_calls to chatgpt_codex provider (#7867) fix: tool confirmation handling for multiple requests (#7856) Remove dead OllamaSetup onboarding flow (#7861) fix: resolve tokio::sync::Mutex deadlock in recipe retry path (#7832) Upgrade Electron 40.6.0 → 41.0.0 (#7851) Only show up to 50 lines of source code (#7578) fix: stop writing without error when hitting broken pipe for goose session list (#7858) feat(acp): add session/set_mode handler (#7801) Keep messages in sync (#7850) More acp tools (#7843) fix: skip upgrade-insecure-requests CSP for external HTTP backends (#7714) ...

* origin/main: (72 commits) No Check do Check (#7942) Log 500 errors and also show error for direct download (#7936) fix: retry on authentication failure with credential refresh (#7812) Remove java/.ai-usage-marker directory (#7925) test(acp): add terminal delegation fixtures and fix shell singleton (#7923) fix: bump pctx_code_mode to 0.3.0 for iterator type checking fix (#7892) feat: persist GooseMode per-session via session DB (#7854) feat(otel): propagate session.id to spans and log records (#7490) fix(test): add env_lock to is_openai_reasoning_model tests (#7917) fix(acp): pass session_id when loading extensions so skills are discovered (#7868) updated canonical models (#7920) feat(autovisualiser): Migrate the autovisualiser extension to MCP Apps (#7852) fix: add tool_choice and parallel_tool_calls to chatgpt_codex provider (#7867) fix: tool confirmation handling for multiple requests (#7856) Remove dead OllamaSetup onboarding flow (#7861) fix: resolve tokio::sync::Mutex deadlock in recipe retry path (#7832) Upgrade Electron 40.6.0 → 41.0.0 (#7851) Only show up to 50 lines of source code (#7578) fix: stop writing without error when hitting broken pipe for goose session list (#7858) feat(acp): add session/set_mode handler (#7801) ...

* main: Add DCO git commit command to AGENTS.md (#7945) fix(claude-code): remove incorrect agent_visible filter on user message (#7931) No Check do Check (#7942) Log 500 errors and also show error for direct download (#7936) fix: retry on authentication failure with credential refresh (#7812) Remove java/.ai-usage-marker directory (#7925) test(acp): add terminal delegation fixtures and fix shell singleton (#7923) fix: bump pctx_code_mode to 0.3.0 for iterator type checking fix (#7892) feat: persist GooseMode per-session via session DB (#7854) feat(otel): propagate session.id to spans and log records (#7490) fix(test): add env_lock to is_openai_reasoning_model tests (#7917) fix(acp): pass session_id when loading extensions so skills are discovered (#7868)

* origin/main: feat: adversarial agent for preventing leaking of info and more (#7948) Update contributing.md (#7927) docs: add credit balance monitoring section (#7952) docs: add Cerebras provider to supported providers list (#7953) docs: add TUI client documentation to ACP clients guide (#7950) fix: removed double dash in pnpm command (#7951) docs: polish ACP docs (#7946) claude adaptive thinking (#7944) feat: new onboarding flow (#7266) Add DCO git commit command to AGENTS.md (#7945) fix(claude-code): remove incorrect agent_visible filter on user message (#7931) No Check do Check (#7942) Log 500 errors and also show error for direct download (#7936) fix: retry on authentication failure with credential refresh (#7812) Remove java/.ai-usage-marker directory (#7925) test(acp): add terminal delegation fixtures and fix shell singleton (#7923) fix: bump pctx_code_mode to 0.3.0 for iterator type checking fix (#7892) feat: persist GooseMode per-session via session DB (#7854)

This was referenced Mar 13, 2026

Bug: GooseMode changes not applied to existing cached sessions #7603

Closed

feat(acp): add session/set_mode handler #7801

Merged

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

crates/goose/src/agents/agent.rs Outdated Show resolved Hide resolved

ui/desktop/src/App.tsx Outdated Show resolved Hide resolved

crates/goose/src/providers/claude_code.rs Outdated Show resolved Hide resolved

jh-block self-assigned this Mar 13, 2026

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

crates/goose/src/providers/codex.rs Show resolved Hide resolved

crates/goose/src/agents/agent.rs Show resolved Hide resolved

codefromthecrypt force-pushed the adrian/persist-mode branch from 9b1a294 to 7113268 Compare March 13, 2026 11:55

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

crates/goose/src/providers/claude_code.rs Show resolved Hide resolved

crates/goose-server/src/routes/agent.rs Show resolved Hide resolved

codefromthecrypt force-pushed the adrian/persist-mode branch 2 times, most recently from dea3fa7 to ddf4b08 Compare March 13, 2026 12:53

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

crates/goose/src/agents/agent.rs Show resolved Hide resolved

codefromthecrypt force-pushed the adrian/persist-mode branch from ddf4b08 to d529590 Compare March 13, 2026 23:26

chatgpt-codex-connector bot reviewed Mar 13, 2026

View reviewed changes

crates/goose/src/providers/codex.rs Show resolved Hide resolved

ui/desktop/src/components/BaseChat.tsx Outdated Show resolved Hide resolved

codefromthecrypt enabled auto-merge March 14, 2026 02:14

chatgpt-codex-connector bot reviewed Mar 14, 2026

View reviewed changes

crates/goose/src/agents/agent.rs Show resolved Hide resolved

ui/desktop/src/components/bottom_menu/BottomMenuModeSelection.tsx Show resolved Hide resolved

codefromthecrypt added 3 commits March 16, 2026 06:10

feat: persist GooseMode per-session via session DB and ACP

62850d7

Signed-off-by: Adrian Cole <adrian@tetrate.io>

more-comments

0485ef9

Signed-off-by: Adrian Cole <adrian@tetrate.io>

codefromthecrypt force-pushed the adrian/persist-mode branch from fcd1c43 to 0485ef9 Compare March 15, 2026 22:46

chatgpt-codex-connector bot reviewed Mar 15, 2026

View reviewed changes

crates/goose/src/providers/codex.rs Show resolved Hide resolved

ui/desktop/src/components/bottom_menu/BottomMenuModeSelection.tsx Show resolved Hide resolved

codefromthecrypt mentioned this pull request Mar 15, 2026

fix(test): add env_lock to is_openai_reasoning_model tests #7917

Merged

2 tasks

fix: seed codex mode before first stream in CLI sessions

586d668

Signed-off-by: Adrian Cole <adrian@tetrate.io>

chatgpt-codex-connector bot reviewed Mar 16, 2026

View reviewed changes

crates/goose/src/providers/codex.rs Show resolved Hide resolved

jh-block approved these changes Mar 16, 2026

View reviewed changes

codefromthecrypt added this pull request to the merge queue Mar 16, 2026

Merged via the queue into main with commit 94fdcdd Mar 16, 2026
23 checks passed

codefromthecrypt deleted the adrian/persist-mode branch March 16, 2026 11:50

github-actions bot mentioned this pull request Mar 17, 2026

chore(release): release version 1.28.0 (minor) #7780

Open

Conversation

codefromthecrypt commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Providers

Subagents beware

Type of Change

AI Assistance

Testing

Goose UI

Zed (ACP)

Related Issues

Screenshots

Goose UI

Zed

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codefromthecrypt commented Mar 13, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codefromthecrypt commented Mar 13, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codefromthecrypt commented Mar 14, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codefromthecrypt commented Mar 16, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codefromthecrypt commented Mar 13, 2026 •

edited

Loading