Skip to content

Fix critical evolve, rollback, and setup regressions#257

Draft
cursor[bot] wants to merge 1 commit into
mainfrom
cursor/critical-bug-investigation-84eb
Draft

Fix critical evolve, rollback, and setup regressions#257
cursor[bot] wants to merge 1 commit into
mainfrom
cursor/critical-bug-investigation-84eb

Conversation

@cursor
Copy link
Copy Markdown
Contributor

@cursor cursor Bot commented May 31, 2026

Summary

  • Prevent dirty working trees from starting adopt manual changes and AI evolve concurrently; prompt users to resolve/adopt through the existing guarded dialog first.
  • Keep committable rollback processing and change-map refresh tied to rebuild success/finalize instead of unlocking immediately after activation starts.
  • Preserve the displayed setup host when users click Next without reselecting it.
  • Gate E2E permission skip env vars to debug builds and require truthy VITE_NIXMAC_SKIP_PERMISSIONS values.

Test Plan

  • bun -F native test:unit -- src/components/widget/promptinput/prompt-input.test.tsx src/components/widget/steps/setup-step.test.tsx src/hooks/use-rollback.test.ts
  • bun -F native build
  • Attempted: cargo +stable test --locked --manifest-path apps/native/src-tauri/Cargo.toml system::permissions::tests::vite_permission_skip_requires_truthy_value (blocked by existing Tauri compile errors in apps/native/src-tauri/src/main.rs and apps/native/src-tauri/src/peek.rs before this test runs)

Docs

  • Docs updated (companion PR in darkmatter/nixmac-web: #___)
  • No docs update needed
Open in Web View Automation 

Co-authored-by: cooper <czxtm@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

Warnings
⚠️ PR is marked WIP / draft — do not merge until ready for review.
⚠️ Please assign this PR to someone (usually yourself).

📋 PR Overview

Lines changed 346 (+338 / -8)
Files 3 added, 4 modified, 0 deleted
Draft / WIP yes
Has Test Plan yes
New UI components no
New Storybook stories no
New Rust modules no
New TS source files no
New tests yes (3)
package.json touched no
Cargo.toml touched no
Infra / CI touched no

🔬 Coverage

Report Lines Statements Functions Branches
apps/native/coverage/coverage-summary.json 19.1% 19.1% 31.7% 54.6%

Generated by 🚫 dangerJS against 105a769

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant