feat(hooks): pass working_dir to the Stop hook context - #10296
Merged
alexhancock merged 2 commits intoJul 17, 2026
Conversation
The Stop hook already emits last_assistant_message (aaif-goose#9968) but not the session working directory, so a Stop hook that shells out to a verifier must guess the repo from the process cwd. Thread session.working_dir through emit_stop_hook / emit_stop_hook_blocking into stop_hook_context and set it via the existing .with_working_dir builder, matching the other lifecycle events. Additive; no behavior change for hooks that ignore working_dir. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CxaoNZnqVZjmEELjLbV4BX
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f7b2becb78
ℹ️ About Codex in GitHub
Your team has set up Codex to 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 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| } | ||
|
|
||
| async fn emit_stop_hook(&self, session_id: &str, last_assistant_message: &str) { | ||
| async fn emit_stop_hook(&self, session_id: &str, last_assistant_message: &str, working_dir: &str) { |
There was a problem hiding this comment.
The repository instructions in AGENTS.md require formatting (Never: Skip cargo fmt), and RUSTUP_TOOLCHAIN=1.92.0-x86_64-unknown-linux-gnu cargo fmt --check fails on this newly expanded signature. This will fail the formatting gate until the commit is run through cargo fmt.
Useful? React with 👍 / 👎.
alexhancock
approved these changes
Jul 15, 2026
Wrap the emit_stop_hook signature to satisfy cargo fmt (the line exceeded rustfmt's 100-char max_width). Unblocks the Check Rust Code Format CI job; matches the already-wrapped emit_stop_hook_blocking sibling. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01H1BcytE8qDDc511EHjQU92
michaelneale
added a commit
that referenced
this pull request
Jul 20, 2026
* origin/main: (24 commits) fix(session): create inventory tables atomically with schema version (#10586) fix(providers): rewrite oneOf to anyOf in tool schemas for OpenAI-compatible backends (#10571) fix(evals): report cache-aware Harbor costs (#10430) fix(acp): allow custom model as default for non-local providers (#10438) fix(config): require absolute goose path roots (#10454) chore(deps): bump astral-sh/setup-uv from 8.2.0 to 8.3.2 (#10541) fix(permissions): scope smart approval by request (#10457) fix(summon): preserve fixed subrecipe values (#10452) chore(deps): bump websocket-driver from 0.7.4 to 0.7.5 in /documentation (#10506) fix(flatpak): bundle git so hermit can clone its package registry (#10511) feat(hooks): pass working_dir to the Stop hook context (#10296) chore(deps): bump actions/setup-java from 5.5.0 to 5.6.0 (#10540) chore(deps): bump actions/setup-node from 6 to 7 (#10539) chore(deps): bump EmbarkStudios/cargo-deny-action from 2.0.20 to 2.1.1 (#10542) chore(deps): bump gradle/actions/setup-gradle from 4.4.3 to 6.2.0 (#10543) Add declarative Sakana AI provider for the OpenAI-compatible Fugu API (#10357) fix(developer): expose AGENT_SESSION_ID to shell commands (#10428) Clean up stale documentation audit findings (#10114) Restore model interactions viewer (#10205) fix(acp): forward image content chunks to client during live session (#10485) ... # Conflicts: # crates/goose/src/session/session_manager.rs
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
2 participants
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.
What
The Stop hook already emits
last_assistant_message(#9968) but not the session working directory. A Stop hook that shells out to an external verifier (e.g. a completion/anti-confabulation check) therefore has to guess the repo from the process cwd, which isn't reliable across launch contexts.This threads
session.working_dirthroughemit_stop_hook/emit_stop_hook_blockingintostop_hook_context, setting it via the existing.with_working_dirbuilder — matching the other lifecycle events that already carry it.Why
With both
last_assistant_messageandworking_diron the Stop context, a blocking Stop hook can verify the right repo against the agent's actual final message and block a false "done" deterministically — without depending on where goose was launched.Notes
working_dirare unaffected; no behavior change.cargo check -p goosepasses.🤖 Generated with Claude Code