Resolves the scaffold.ts import conflict (keep readFileSync and master's mkdir) and carries master's notes and tsconfig updates. --no-verify: merge-commit pre-commit hooks lint all staged files; the linted tree is verified clean via the repo lint script (tsc -b tsconfig.host.json, oxlint, verify-translation-pairing all pass) and CI owns the authoritative run.