fix: split `made_edit_or_build_check` into separate flags and minor whitespace cleanup by scottmcmaster · Pull Request #288 · darkmatter/nixmac

Scott McMaster (scottmcmaster) · 2026-06-03T07:08:39Z

Summary

"made edit" and "made build check" are tracked separately again (or now); this is to try and fix the build on develop

Test Plan

No test plan needed

Docs

Docs updated (companion PR in darkmatter/nixmac-web: #___)
No docs update needed

View with Codesmith Autofix with Codesmith
^{Need help on this PR? Tag /codesmith with what you need. Autofix is disabled.}

Scott McMaster (scottmcmaster) · 2026-06-03T07:08:52Z

refactor: migrate commit_all and create_evolution_backup staging to git2, kill git_command wrapper #319
refactor: migrate checkout_files_at_commit, restore_all, and restore_from_branch_ref to git2 #311
refactor: migrate intent_add_untracked to git2, setting INTENT_TO_ADD flag without shelling out #310
refactor: remove git stash command and related functionality #291
refactor: migrate create_evolution_backup internals to git2, remove get_head_sha wrapper #290
refactor: migrate tag_commit to git2, remove unused delete_backup_branch #289
refactor: update file_diff_contents to use git2 instead of CLI, make path helper more robust #283
refactor: port the git log function from CLI to git2 #281
refactor: nix-files feedback reusing git status, eliminate resulting dead code #278
fix: split made_edit_or_build_check into separate flags and minor whitespace cleanup #288 👈 (View in Graphite)
develop

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

automerge - adds this PR to the back of the merge queue
urgent - for urgent changes, fast-track this PR to the front of the merge queue

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

Juanpe Bolívar (arximboldi)

LGTM!

(Reviewing through Graphite, giving this whole stack thing another try).

github-actions · 2026-06-04T11:31:32Z

	Fails
🚫	`bun` failed.

Log

Details

Generated by 🚫 dangerJS against 0c09458

Copilot

Pull request overview

This PR updates the Rust evolution loop (apps/native/src-tauri/src/evolve/mod.rs) to track “made an edit” vs “ran a build check” as separate flags, and adjusts how evolution limits are loaded to help address a build issue on develop.

Changes:

Split the previous combined “edit or build check happened” tracking into two booleans: made_edit and made_build_check.
Refactor evolution limit loading (notably moving max_output_tokens to be read via store::get_max_output_tokens, and loading max_build_attempts via config::EvolutionLimits::load).
Minor whitespace/comment cleanup.

 // Re-export public API
-use crate::shared_types::EvolutionState;
+use crate::shared_types::{Evolution, EvolutionState, FileEdit};
 use crate::system::nix;


* Improve nixos/home-manager/nix-darwin doc tool Improves doc tool by splitting up large JSON into a hierarchical directory structure, and adds an index at the root containing a table of contents and short info about each key. This reduces context usage in the same way that the index in skills does. The tools is also split up into two separate tools, one for searching keys, and one for getting more info about that key. * chore: fix merge pr 255 (#292) * feat(console): add resizable log panel * feat(state): wire runtime slices and summarizer * chore(fmt): add treefmt wiring * chore(credentials): remove legacy plaintext fallback * ci: add evaluate workflow * fix(theme): scope Minted to Monaco diffs * feat(settings): split backup and tuning panels * refactor(frontend): move backend mirrors to viewmodel * chore(beads): update state migration issues * fix: repair branch-wide breakage so the merge compiles & tests pass Prior to this commit, both this branch (since a92e61b) and the merge result failed `cargo check` with 22 errors. The user asked for cargo + bun validation against the merge resolution, so this commit fixes the preexisting structural breakage that the merge inherited, plus a few follow-ups uncovered by the test suites. Rust: - git/mod.rs: restore the develop-side mod.rs that declares `pub mod query` / `pub mod init` and re-exports the right names from each. The orphan query.rs / init.rs files were already on disk; only the mod entry was missing after a92e61b accidentally gutted it. - evolve/mod.rs: route `repo_root` through `git::query` (its new home), pull `FileEdit` from `shared_types`, re-export `Evolution` from `shared_types::Evolution` (types.rs only imports it, doesn't re-export it), and fix the `made_edit_or_build_check` typo that develop's PR #272 introduced (variable never defined; should be `made_edit || made_build_check`). - shared_types/git.rs: re-add `WatcherEvent` alongside the unused `GitState` slice type — `state/watcher.rs` still constructs it and needs the symbol back. Marked `GitState` `#[allow(dead_code)]` until the watcher migration finishes. - summarize/queue_summarizer.rs: `#[allow(dead_code)]` on the not-yet-wired worker scaffolding (a92e61b carryover). - commands/settings_io.rs: update an EvolutionLimits test fixture to include the new `max_token_budget` / `max_output_tokens` fields. Frontend (post-merge tweaks): - ipc/api.ts: drop the duplicate `devConfigs` entry the auto-merge produced (it appeared once near `settings` and again after `promptHistory`). - ipc/types.ts: regenerated via `cargo run --example specta_gen_ts` to drop duplicated `ConfigField` / `ConfigurableSchema` / `EnumVariant` / `FieldType` blocks the auto-merge dual-inserted. - viewmodel/git.ts + viewmodel.test.ts: switch the `git_state_changed` payload type from `GitState` (unused TS-side) to `WatcherEvent` (what the Rust watcher actually emits). - hooks/use-evolve.ts: drop the eager `mirrorChangeMapState(null)` at the top of `handleEvolve`. Line 109 already correctly avoids overwriting the change map for conversational responses; the eager clear contradicted that and broke develop's PR #243 test that exercises conversational follow-ups. - Tests (`use-evolve.test.ts`, `use-rollback.test.ts`, `prompt-input.test.tsx`, `system-defaults-cta.test.tsx`): swap the removed `setGitStatus` / `setEvolveState` / `setChangeMap` / `setSummaryAvailable` widget-store setters for the viewmodel mirror fns (`mirrorGitState`, `mirrorEvolveState`, `mirrorChangeMapState`). `summaryAvailable` no longer exists on the widget store; the related assertions are dropped. - Storybook snapshots: 30 stories were regenerated after the AI Models tab field split, the system-defaults icon swap, and the hunk-pill render going through `DiffLineStatsBadge`. Validation: - `cargo check`: clean - `cargo test`: 366 passed - `bun run test:unit`: 116 passed - `bun run test:storybook`: 165 passed - `bun run build` (tsc + vite): clean Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix signing * refactor: restore slice-event-per-slice contract in watcher The earlier repair commit (8a19689) brought back `WatcherEvent` to make state/watcher.rs compile, but that struct bundles four slices' worth of state (git_status, change_map, evolve_state, error) onto the `git_state_changed` channel. The intended architecture is one event per slice, each carrying just that slice's state. Watcher now emits: - `git_state_changed` → GitState { git_status, external_build_detected } - `change_map_changed` → SemanticChangeMap (unchanged) - `evolve_state_changed` is no longer emitted from the watcher at all; evolve_state::set() writes through Slice<EvolveState>, whose write-guard already emits the event on drop. The watcher was emitting it twice. Drop WatcherEvent from shared_types/git.rs and from the specta registration; the `#[allow(dead_code)]` on GitState becomes unnecessary. Separately, queue_summarizer's three #[allow(dead_code)] annotations were honest: the commit a92e61b ("feat: wire runtime slices and summarizer") never actually wired the worker — `app.manage(start_worker(handle)?)` was missing from main.rs. Adding it now so the pipelines' `try_state::<SummarizerState>()` path is actually used instead of always falling back to inline processing. Frontend follow-ups: - viewmodel/git.ts subscribes `git_state_changed` as `GitState` now. - viewmodel.test.ts constructs `GitState` (2 fields), not the made-up 5-field WatcherEvent. - types.ts regenerated via `cargo run --example specta_gen_ts`. Validation: cargo check clean, 366 cargo tests pass, 116 unit tests pass, tsc + vite build clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: some permission tests would fail on CI Replace with more effective and reproducible tests. --------- Co-authored-by: Cooper Maruyama <me@cooperm.com> Co-authored-by: cooper <1325802+czxtm@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * scott-fix-made-edit-or-build-check (#288) * ci(danger): use Node.js for coverage and danger steps Bun 1.3.2 cannot run @vitest/coverage-v8 (node:inspector not implemented) and fails to resolve Danger's internal runner module ('Script not found "runner"'). Switch both the coverage generation and the danger ci steps to npx (Node.js 22) while keeping bun for dependency installation. Also adds statuses:write permission so Danger can set commit statuses. * Improve nixos/home-manager/nix-darwin doc tool Improves doc tool by splitting up large JSON into a hierarchical directory structure, and adds an index at the root containing a table of contents and short info about each key. This reduces context usage in the same way that the index in skills does. The tools is also split up into two separate tools, one for searching keys, and one for getting more info about that key. --------- Co-authored-by: Juanpe Bolívar <raskolnikov@gnu.org> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Scott McMaster <scott@smcmaster.com> Co-authored-by: darkmatter[bot] <283346107+darkmatter[bot]@users.noreply.github.com>

Scott McMaster (scottmcmaster) marked this pull request as ready for review June 3, 2026 07:09

Scott McMaster (scottmcmaster) requested review from Copilot and cooper (czxtm) and removed request for Copilot June 3, 2026 07:09

Copilot started reviewing on behalf of Scott McMaster (scottmcmaster) June 3, 2026 07:10 View session

Scott McMaster (scottmcmaster) changed the title ~~scott-fix-made-edit-or-build-check~~ fix: split made_edit_or_build_check into separate flags and minor whitespace cleanup Jun 3, 2026

Juanpe Bolívar (arximboldi) approved these changes Jun 3, 2026

View reviewed changes

Scott McMaster (scottmcmaster) enabled auto-merge June 4, 2026 01:52

This was referenced Jun 4, 2026

refactor: migrate intent_add_untracked to git2, setting INTENT_TO_ADD flag without shelling out #310

Closed

refactor: migrate checkout_files_at_commit, restore_all, and restore_from_branch_ref to git2 #311

Closed

cooper (czxtm) mentioned this pull request Jun 4, 2026

CI: Blacksmith runner missing macOS Developer ID signing certificate #314

Closed

scott-fix-made-edit-or-build-check

0c09458

cooper (czxtm) force-pushed the 06-03-scott-fix-made-edit-or-build-check branch from 834dc3b to 0c09458 Compare June 4, 2026 11:29

Copilot AI review requested due to automatic review settings June 4, 2026 11:29

Copilot started reviewing on behalf of cooper (czxtm) June 4, 2026 11:29 View session

Copilot AI reviewed Jun 4, 2026

View reviewed changes

Comment thread apps/native/src-tauri/src/evolve/mod.rs

Comment on lines 29 to 31

// Re-export public API

use crate::shared_types::EvolutionState;

use crate::shared_types::{Evolution, EvolutionState, FileEdit};

use crate::system::nix;

Scott McMaster (scottmcmaster) added this pull request to the merge queue Jun 4, 2026

Merged via the queue into develop with commit d445d24 Jun 4, 2026
14 of 15 checks passed

Scott McMaster (scottmcmaster) deleted the 06-03-scott-fix-made-edit-or-build-check branch June 4, 2026 11:52

cooper (czxtm) pushed a commit that referenced this pull request Jun 4, 2026

scott-fix-made-edit-or-build-check (#288)

e3488c2

Scott McMaster (scottmcmaster) mentioned this pull request Jun 5, 2026

refactor: migrate commit_all and create_evolution_backup staging to git2, kill git_command wrapper #319

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: split `made_edit_or_build_check` into separate flags and minor whitespace cleanup#288

fix: split `made_edit_or_build_check` into separate flags and minor whitespace cleanup#288
Scott McMaster (scottmcmaster) merged 1 commit into
developfrom
06-03-scott-fix-made-edit-or-build-check

Scott McMaster (scottmcmaster) commented Jun 3, 2026 •

edited

Loading

Uh oh!

Scott McMaster (scottmcmaster) commented Jun 3, 2026 •

edited

Loading

Uh oh!

Juanpe Bolívar (arximboldi) left a comment

Uh oh!

github-actions Bot commented Jun 4, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Scott McMaster (scottmcmaster) commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test Plan

Docs

Uh oh!

Scott McMaster (scottmcmaster) commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to use the Graphite Merge Queue

Uh oh!

Juanpe Bolívar (arximboldi) left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jun 4, 2026

Log

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Scott McMaster (scottmcmaster) commented Jun 3, 2026 •

edited

Loading

Scott McMaster (scottmcmaster) commented Jun 3, 2026 •

edited

Loading