feat: add --edit session flag to edit conversation before forking by murphysean · Pull Request #9799 · aaif-goose/goose

murphysean · 2026-06-15T04:32:24Z

Summary

Adds a --edit flag to goose session that opens the session's conversation in your editor as YAML, letting you edit/trim/rewrite messages before continuing. Combined with --fork, this enables "branching" a conversation at any point — remove unwanted messages, rewrite a prompt, or trim context before continuing.

Usage

goose session --resume <session-id> --fork --edit --history

How it works

Loads the original session's conversation
Serializes messages to YAML in a temp file
Opens $VISUAL / $EDITOR / vi
Parses edited YAML back into messages
Creates a new session (or updates in-place) with the edited conversation
Resumes interactive mode from the (possibly new) session

Changes

cli.rs: New --edit flag (requires --resume, can be paired with --fork)
session/editor.rs: New edit_conversation() — consolidated editor logic here, reusing existing launch_editor() and resolve_editor_command()
- Removed commands/editor.rs — the separate module was unnecessary, editor resolution and shlex parsing were duplicated with session/editor.rs
- New resolve_editor_or_default() public helper wraps config/env resolution with vi/notepad fallback
session/editor.rs: Fixed detect_editor() bug where an empty/whitespace-only $VISUAL would bypass the $EDITOR fallback and panic on parts[0] indexing — now properly skips empty values and falls through
session/editor.rs: Changed shell-word splitting from split_whitespace() (breaks on quoted paths like "/Applications/Sublime Text.app/.../subl") to shlex::split() with proper error handling
session/mod.rs: Made editor module public

Testing

34 tests (29 existing + 5 new covering fallback/resolution logic)
Manual testing with various editors (vim, nvim, code --wait)
Verified YAML serialization round-trip preserves message content
Tested error cases: editor exit non-zero, invalid YAML after edit, empty $VISUAL env var, quoted editor paths with spaces
cargo fmt, cargo clippy -- -D warnings clean

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 422be626cd

ℹ️ 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".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b8c252c4f9

ℹ️ 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".

DOsinga · 2026-06-17T16:22:01Z

Thanks for this! One naming concern: --fork-session is confusing since we already have --fork — the new flag reads like a synonym but actually means "edit the conversation, then fork".

It's a cool power-user tool though. Could you attach the editing behavior to the existing --fork via a separate --edit flag instead (i.e. --resume --fork --edit)? That keeps the fork surface coherent, and an --edit flag to open the conversation in $EDITOR could be useful in other situations too, not just forking.

Also, codex still has one open comment: split_whitespace breaks on quoted editor paths (e.g. "/Applications/Sublime Text.app/.../subl" -w) — worth using shell-word splitting there.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9ead476a33

ℹ️ 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".

DOsinga

Thanks for iterating on this — the semantics are clean and read well (--resume = open it, --edit = edit it first, --fork = make a copy before doing all this). A few things before this can land:

(blocker) The --edit --fork path drops session metadata — see the inline thread on cli.rs. It should route through copy_session so it stays consistent with plain --fork, which also lets you collapse the three branches into one.
let is_fork = fork; is a no-op rename — just use fork directly.
editor.rs has several comments that just restate the code (// Inner resolution logic, separated for testability, // Always try to clean up the symlink, // Empty prefill should not appear in content, etc.). These can go — the names already carry the meaning.
The resolve_editor_* tests are over-fitted — e.g. test_resolve_editor_default_is_vi just asserts a constant, and there are many near-identical permutations. One test covering the config → VISUAL → EDITOR priority order plus the empty-skip behavior is plenty; the rest add noise without catching real bugs.

Will revisit in a few days.

Signed-off-by: Sean Murphy <murphysean84@gmail.com>

…tting - Rename --fork-session to --edit for a more composable interface: - --resume --edit: edit conversation in nvim before resuming - --resume --fork --edit: edit conversation then fork into new session - --resume --fork: unchanged (fork without editing) - Fix editor command parsing in both editor.rs files to use shlex::split() instead of split_whitespace(), so quoted paths like "/Applications/Sublime Text.app/.../subl" -w and empty-string args like emacsclient -a "" -t work correctly

…VISUAL bug - Remove commands/editor.rs and fold edit_conversation() into session/editor.rs, reusing existing launch_editor() and resolve_editor_command() — eliminates duplicated editor resolution and shlex parsing logic - Fix detect_editor() bug: empty/whitespace-only no longer panics on parts[0] indexing; falls through to nvim then default - Add resolve_editor_or_default() public helper wrapping config/env resolution with vi/notepad fallback - Add 5 tests for the new fallback and resolution logic - Make session::editor module public for cli.rs access

- Update in-session-actions.md: replace 'not available in CLI' with --edit and --fork --edit usage examples for both Edit in Place and Fork Session sections - Update goose-cli-commands.md: add --edit flag documentation and usage examples for editing and forking sessions

…logic, comments, and tests

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e32a2c981a

ℹ️ 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".

shlex::split applies Unix shell escaping which strips backslashes from unquoted Windows paths like C:\Windows\System32\notepad.exe. Only use shell-word splitting when the command contains quotes, otherwise split on whitespace.

DOsinga · 2026-06-25T13:57:58Z

Pushed a fix for the codex Windows-backslash comment: shlex::split only kicks in now when the command actually contains quotes (so "…/Sublime Text.app/…/subl" -w still parses), otherwise we split on whitespace so unquoted Windows paths like C:\Windows\System32\notepad.exe keep their backslashes. Added a test_split_editor_command covering all three cases.

Thanks for the iterations — the copy_session rework looks good. Snoozing for a few days so CI runs and you have a chance to look it over.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 05d3be5e3b

ℹ️ 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".

chatgpt-codex-connector · 2026-06-25T14:02:15Z

+                let copied = session_manager
+                    .copy_session(id, original.name.clone())
+                    .await?;


Defer creating the fork until edit succeeds

When --fork --edit is used and the editor exits non-zero or the YAML does not parse, this copy_session has already persisted a duplicate session with the unedited history; the command then returns before replace_conversation, leaving a stray most-recent fork even though the edit was rejected. Parse the edited conversation before creating the fork, or delete the copied session on any edit/replace failure.

Useful? React with 👍 / 👎.

DOsinga

CI is green and the Windows editor-path fix is in. The copy_session rework addressed the earlier blocker cleanly, and the --resume --fork --edit shape is nice. LGTM 🚀

murphysean · 2026-06-27T02:23:50Z

Nice, thanks for the feedback, and helping me get this across the line. I kinda agree with the latest ai assisted review, so I'm going to put in a fix for that right now. Hopefully it runs out of feedback, lol :)

* main: (26 commits) Fix MCP app sandbox bridge lifecycle (#10064) fix(bedrock): send inference config (max_tokens, temperature) on Converse (#9889) feat(providers): support OpenRouter request parameters (#9276) Migrate local inference model management to ACP (#10124) (attempt to) fix disk space errors in linux release builds (#10024) feat: add --edit session flag to edit conversation before forking (#9799) feat: add iFlytek Spark and Astron MaaS providers (#9837) fix(desktop): dedupe Nostr session deep link imports (#9918) [codex] Add SessionStart hook parity outside CLI (#9970) feat(providers): add Fireworks AI declarative provider (#9990) fix(providers): don't retry deterministically-permanent 400s (thinking-block immutability) (#10005) fix(deps): downgrade pkcs8 to v0.10 to match sec1/pkcs1 v0.7 (#10119) chore(deps): bump actions/cache from 5.0.2 to 6.0.0 (#10051) Make OpenAI Responses API store param configurable (#10040) remove unsupported model (#10121) chore(release): bump version to 1.40.0 (minor) (#10099) move ollama provider into goose-providers (#9986) UI acp migratoin: Decouple desktop UI types from generated OpenAPI types (#10109) fix(otel): use async reqwest client so OTLP export works in `goose serve` mode (#10100) feat (acp): exposed available tools in acp schema (#10097) ...

* main: (42 commits) Fix MCP app sandbox bridge lifecycle (#10064) fix(bedrock): send inference config (max_tokens, temperature) on Converse (#9889) feat(providers): support OpenRouter request parameters (#9276) Migrate local inference model management to ACP (#10124) (attempt to) fix disk space errors in linux release builds (#10024) feat: add --edit session flag to edit conversation before forking (#9799) feat: add iFlytek Spark and Astron MaaS providers (#9837) fix(desktop): dedupe Nostr session deep link imports (#9918) [codex] Add SessionStart hook parity outside CLI (#9970) feat(providers): add Fireworks AI declarative provider (#9990) fix(providers): don't retry deterministically-permanent 400s (thinking-block immutability) (#10005) fix(deps): downgrade pkcs8 to v0.10 to match sec1/pkcs1 v0.7 (#10119) chore(deps): bump actions/cache from 5.0.2 to 6.0.0 (#10051) Make OpenAI Responses API store param configurable (#10040) remove unsupported model (#10121) chore(release): bump version to 1.40.0 (minor) (#10099) move ollama provider into goose-providers (#9986) UI acp migratoin: Decouple desktop UI types from generated OpenAPI types (#10109) fix(otel): use async reqwest client so OTLP export works in `goose serve` mode (#10100) feat (acp): exposed available tools in acp schema (#10097) ...

* main: (31 commits) test: generic validator for declarative providers (#10010) UI acp migratoin: Decouple desktop UI types from generated OpenAPI types (Part 2) (#10149) Remove MCP sampling support (#10087) Support TLS for ACP serve (#10088) feat (ui): Migrate dictation local model manager to ACP (#10131) Fix MCP app sandbox bridge lifecycle (#10064) fix(bedrock): send inference config (max_tokens, temperature) on Converse (#9889) feat(providers): support OpenRouter request parameters (#9276) Migrate local inference model management to ACP (#10124) (attempt to) fix disk space errors in linux release builds (#10024) feat: add --edit session flag to edit conversation before forking (#9799) feat: add iFlytek Spark and Astron MaaS providers (#9837) fix(desktop): dedupe Nostr session deep link imports (#9918) [codex] Add SessionStart hook parity outside CLI (#9970) feat(providers): add Fireworks AI declarative provider (#9990) fix(providers): don't retry deterministically-permanent 400s (thinking-block immutability) (#10005) fix(deps): downgrade pkcs8 to v0.10 to match sec1/pkcs1 v0.7 (#10119) chore(deps): bump actions/cache from 5.0.2 to 6.0.0 (#10051) Make OpenAI Responses API store param configurable (#10040) remove unsupported model (#10121) ...

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

Comment thread crates/goose-cli/src/cli.rs Outdated

Comment thread crates/goose-cli/src/commands/editor.rs Outdated

murphysean force-pushed the feat/fork-session-edit branch from 422be62 to b8c252c Compare June 15, 2026 05:16

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

Comment thread crates/goose-cli/src/commands/editor.rs Outdated

DOsinga added the snoozed:20260621 label Jun 17, 2026

murphysean force-pushed the feat/fork-session-edit branch from b8c252c to 9ead476 Compare June 19, 2026 06:40

chatgpt-codex-connector Bot reviewed Jun 19, 2026

View reviewed changes

Comment thread crates/goose-cli/src/commands/editor.rs Outdated

murphysean force-pushed the feat/fork-session-edit branch from 9ead476 to a94329e Compare June 20, 2026 00:38

DOsinga reviewed Jun 22, 2026

View reviewed changes

DOsinga added snoozed:20260625 and removed snoozed:20260621 labels Jun 22, 2026

murphysean changed the title ~~feat: add --fork-session flag to edit conversation before forking~~ feat: add --edit session flag to edit conversation before forking Jun 23, 2026

murphysean added 5 commits June 23, 2026 01:51

feat: add --fork-session flag to edit conversation before forking

048450d

Signed-off-by: Sean Murphy <murphysean84@gmail.com>

refactor: address PR aaif-goose#9799 feedback on session edit / fork …

e32a2c9

…logic, comments, and tests

murphysean force-pushed the feat/fork-session-edit branch from 6439800 to e32a2c9 Compare June 23, 2026 09:11

chatgpt-codex-connector Bot reviewed Jun 23, 2026

View reviewed changes

Comment thread crates/goose-cli/src/session/editor.rs Outdated

fix: preserve backslashes in unquoted Windows editor paths

05d3be5

shlex::split applies Unix shell escaping which strips backslashes from unquoted Windows paths like C:\Windows\System32\notepad.exe. Only use shell-word splitting when the command contains quotes, otherwise split on whitespace.

DOsinga added snoozed:20260628 and removed snoozed:20260625 labels Jun 25, 2026

chatgpt-codex-connector Bot reviewed Jun 25, 2026

View reviewed changes

DOsinga approved these changes Jun 25, 2026

View reviewed changes

DOsinga added this pull request to the merge queue Jun 30, 2026

Merged via the queue into aaif-goose:main with commit 20966fd Jun 30, 2026
25 checks passed

github-actions Bot mentioned this pull request Jul 2, 2026

chore(release): release version 1.41.0 #10199

Closed

BrewTestBot mentioned this pull request Aug 12, 2026

block-goose-cli 1.46.0 Homebrew/homebrew-core#298471

Merged

Uh oh!

Conversation

murphysean commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Usage

How it works

Changes

Testing

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!

DOsinga commented Jun 17, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

DOsinga left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

DOsinga commented Jun 25, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 25, 2026

Choose a reason for hiding this comment

Uh oh!

DOsinga left a comment

Choose a reason for hiding this comment

Uh oh!

murphysean commented Jun 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

murphysean commented Jun 15, 2026 •

edited

Loading