fix(stella-core): drop the duplicate Mutex import two unbreak PRs both added

[macanderson]

main is red again at eb427c2da. One line fixes it.

error[E0252]: the name `Mutex` is defined multiple times
   --> crates/stella-core/src/driver/restore.rs:426:9
422 |     use std::sync::Mutex;   <- #3263
426 |     use std::sync::Mutex;   <- #3265

What happened

Two PRs diagnosed the same red main independently and shipped the same repair:

• fix(stella-core): repair main — the tool purge and #3253 composed into a red build #3263 fix(stella-core): repair main — the tool purge and #3253 composed into a red build (76ad90621)
• fix(stella-core): unbreak main — restore.rs references a test double #3244 deleted #3265 fix(stella-core): unbreak main — restore.rs references a test double #3244 deleted (678f41c27)

Mine was #3265. I checked for an in-flight fix before starting (gh pr list filtered on restore/fix/compile) and found none — #3263 was opened after that check and merged before mine, so by the time #3265 landed the repair was already in. The two edits sit at different lines, so git had no conflict to report and merged both.

The rest of the two repairs converged on byte-identical text — both pointed #3253's starvation witnesses at SkillTools and both removed the orphaned ToolCall/ToolOutput/RESTORE_CALL_ID — so this duplicated import is the entire delta.

The fix

Delete the second import. Keeps the placement #3263 chose, since it landed first.

Verify

cargo test -p stella-core --lib driver::restore   # 6 passed, 0 failed
cargo clippy -p stella-core --all-targets         # clean, no warnings
cargo fmt -p stella-core -- --check               # clean

No tests deleted or renamed. No behavior change.

Note

This is the second red main in a row out of the same file, and the two causes are different: #3267 tracks the first (a clean merge deleting a test helper another PR was concurrently using). This one is the duplicate-repair hazard — two agents racing the same breakage — which a merge queue would also have caught, and which is more evidence for option 1 in #3267.

Summary by Sourcery

Bug Fixes:

• Resolve a compile error in stella-core restore.rs by dropping the extra std::sync::Mutex import in the test module.

[sourcery-ai]

Sorry @macanderson, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
stella-cli-docs	Ignored		Aug 14, 2026 7:02pm

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Removes a duplicated Mutex import in stella-core's restore driver tests that was introduced by two overlapping fixes, restoring compilation without changing behavior.

File-Level Changes

Change	Details	Files
Remove the redundant Mutex import in the restore driver tests to fix duplicate definition compilation error.	Deleted the second std::sync::Mutex import within the tests module of the restore driver. Kept the original Mutex import placement from the first merged PR to avoid future confusion and preserve history.	crates/stella-core/src/driver/restore.rs

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[macanderson]

Superseded by #3276, which landed the same one-line removal (plus the stranded test double). Closing rather than adding a fourth repair to the same file — see #3267 for the underlying race.