- 충돌 없음: 자동 병합 성공
- upstream fix(mcp): OAuth 콜백 서버 유휴 시 자동 종료 (anomalyco#32245)
- upstream fix(mcp): 툴 에러 콘텐츠 타입 처리 (anomalyco#32244)
- upstream fix(mcp): OAuth 콜백 에러 이스케이프 (anomalyco#32242)
- upstream fix(mcp): escape 로직 통합 리팩토링 (anomalyco#32360)
- upstream fix(stats): 홈페이지 모델 랭킹 정렬 개선
- 커스텀 보존: JeongEEE URL ✅ | logo 자동효과 ✅ | pcode ✅ | i18n ✅ | BottomBar ✅ | 플러그인 자동 최신화 ✅

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Inherits upstream anomalyco#32244/anomalyco#32246 source (isError -> throw), adapted to fork's convertMcpTool.
Skips the @modelcontextprotocol/sdk@1.29 patch (fork pins 1.27.1). MCP tool errors now
propagate to the agent instead of being silently returned as error-results.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* upstream: (4536 commits)
  fix(opencode): sanitize OpenAI MCP tool schemas (anomalyco#32489)
  chore: update nix node_modules hashes
  fix(provider): pass apiKey to createUnified for Cloudflare AI Gateway (anomalyco#32052)
  chore: generate
  feat(app): make session timelines much faster AND without flicker or scroll jumps (anomalyco#32331)
  chore: update nix node_modules hashes
  chore: generate
  experiment: better web picker using @pierre/tree (anomalyco#31208)
  fix(mcp): default tool schema properties (anomalyco#32568)
  fix(web): persist docs language selection (anomalyco#32551)
  fix(tui): render move errors inline (anomalyco#32241)
  Revert "fix(mcp): type tool error content"
  fix(mcp): enable progress timeout resets (anomalyco#32477)
  fix(mcp): stop idle OAuth callback server (anomalyco#32245)
  chore: generate
  chore: update nix node_modules hashes
  fix(mcp): type tool error content
  fix(stats): align homepage model ranks
  fix(mcp): handle tool result errors (anomalyco#32244)
  fix(stats): rank model pages by week
  ...