mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-27 15:13:37 +08:00
c032e38081
Major upstream changes integrated: - providers list drag-and-drop reordering (#753) - streaming stability fixes for slow providers (#766) - active-turn prompt queue with edit/dedupe (#755) - H5 access tokens / ports / background sessions (#767, #764) - OpenAI prompt cache semantics (#789) - exit plan approvals preview (#793) - Windows settings panel stability (#788, #791) - file path expansion when revealing generated files (#776) - in-app browser preview menus (#761) - auto-dream background memory consolidation - compactCount tracking on sessions - streamingResponseChars metric - v0.4.2 release notes Conflict resolution highlights: - providerService: kept HEAD's markThinkingIncompatible + upstream's reorderProviders side-by-side - types/provider: kept FetchModelsSchema + ReorderProvidersSchema both - Settings.tsx: migrated HEAD's compat/thinking badges into upstream's SortableProviderCard slots - chatStore: kept both message-queue implementations (messageQueue + queuedUserMessages) - compact_boundary: merged HEAD's registerCompactionAndShouldSuggest with upstream's compactCount field - exposed __resetCompactionThrashForTesting to fix cross-test state pollution exposed by upstream's new compactCount=2 test Verification: - desktop tsc --noEmit: clean - desktop test suite: 1789/1792 pass (3 pre-existing electron/terminal Windows-only failures, not regressions) - server providers test: 95/95 pass - desktop chatStore tests: 131/131 pass - desktop settingsStore + WorkspacePanel tests: 65/65 pass