upstream-sync: merge simstudioai/sim main into feat/github-merge-agent (2026-08-03) - #677
Conversation
Upstream sync 2026-08-03 — grill questions (480 commits, v0.7.29 → v0.7.52)First run for this range (no prior Q&A in 1. Copilot / "mothership" conflict strategy — BLOCKINGUpstream's mothership v0.8 copilot rewrite (simstudioai#5410 + a long tail: simstudioai#5660, simstudioai#5828, simstudioai#5830, simstudioai#5671, simstudioai#6087, simstudioai#6103) collides with the fork's large, renamed "mothership" copilot surface: The merge policy's
Default if unanswered: fork-first on all mothership/copilot conflicts. 2. CI workflows — BLOCKING
3. bunfig supply-chain gate — advisoryFork sets 4. Desktop app (simstudioai#5998) — advisoryNew additive surface ( Full analysis in |
|
Superseded — starting a fresh upstream-sync run with harness fixes (grill gate, skip husky on merge commits, finalize child agent). |
Upstream sync — 2026-08-03
Merges
simstudioai/sim@13a9119dintofeat/github-merge-agent.Sync range: 480 commit(s) since
e2fecc86(merge-base).Ledger
Verification (advisory — does not block the sync)
❌
bun run check· ❌bun run lint· ❌bun run test· ❌bun run buildVerification is advisory — failures do not block the sync. Review and fix on the draft PR as needed.
bun run check
❌ failed
bun run lint
❌ failed
bun run test
❌ failed
bun run build
❌ failed
Agent usage
parent-grill-analysis
claude-opus-4-8Totals
Cost by agent
Draft — mark ready for review when satisfied.