Skip to content

Ask about Base fixes regardless of the Merge run setting - #964

Merged
JacobStephens2 merged 2 commits into
mainfrom
issue-288
Oct 21, 2026
Merged

JacobStephens2 merged 2 commits into
mainfrom
issue-288

Conversation

@JacobStephens2

@JacobStephens2 JacobStephens2 commented Oct 21, 2026 •

Copy link
Copy Markdown
Owner

Summary

 Setup questions
   Every Run a Merge run?
-  if yes: Every Run may start a Base fix?
+  Every Run may start a Base fix? (current base.fix is the default)

Closes #288

Test seams

  • Setup's existing Outside script: prompts, defaults, and written User config.
  • thirdshift setup on a real terminal: answers persist independently of the Merge run choice.

Evidence

  • Before: cargo test with_merging_off_setup_can_allow_base_fixes --bin thirdshift failed: Setup skipped the expected Base fix prompt and asked about fast-forwarding.
    After: the same regression passes; enabling Base fixes with merging off writes true, and Enter retains a configured true after turning merging off.
  • cargo test --bin thirdshift setup::: 60 passed.
  • cargo test --test setup --test setup_offer --test muse_sessions --test opencode_sessions: 58 passed.
  • cargo check --all-targets: passed.
  • cd site && npm test: regeneration check and all 36 browser tests passed.
  • cargo fmt --check and cargo clippy --all-targets -- -D warnings: passed.
  • Full cargo test run passed every target through Status, then reported one intermittent Stop failure: stopping_a_pass_with_no_issue_ends_it_without_changing_labels observed died before recording an outcome. The exact rerun cargo test --test stop stopping_a_pass_with_no_issue_ends_it_without_changing_labels -- --exact --nocapture passed. cargo test --test stop --test toolchain --test update --test user_config then passed all 36 tests, completing the full suite's target coverage.

Review coverage

Standards and Spec reviewed all eight changed files against main, including site/docs/index.html directly. No changed files were left unread; no generated output was excluded. Reports, including each axis's final files-read list, are saved in .thirdshift-review-ga1gx9/standards.md and .thirdshift-review-ga1gx9/spec.md in the worktree.

Merge Danger

Door: two-way

Blast Radius: Setup

Setup's Base fix answer is independent of its Merge run answer. The no-config default stays false; Base fix execution is unchanged.

Unaddressed findings

Standards

  • Optional Duplicated Code / Shotgun Surgery heuristic: repeated Setup answer transcripts. Declined the proposed shared answer builder. These are explicit interaction fixtures at existing seams: src/setup.rs:531 verifies each next answer belongs to the actual prompt, and tests/support/mod.rs:121 defines terminal input as waiting for a named prompt before typing. Retaining those explicit transcripts keeps each test's intended interaction visible; existing common defaults already live in ENTER_THROUGHOUT and notifications_on. Production question behavior remains centralized in src/setup/questions.rs:118. This is a maintainability judgment, with no behavior defect asserted and no Spec or Day shift decision required.

Spec

None.

Built with codex · gpt-6.1-sol · high

Security review outcome

  • Security review incomplete: session failed, ended early or omitted a valid final line; see Session log

@JacobStephens2
JacobStephens2 merged commit 455558d into main Oct 21, 2026
18 checks passed
@JacobStephens2
JacobStephens2 deleted the issue-288 branch October 21, 2026 20:33
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.

ensure thirdshift setup asks for a base fix setting

1 participant