mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
8a81636757
Remote main already contains PR #217. Local main had provider context-window and auth-strategy work, so this merge keeps both context resolvers and reconciles the desktop Bun lockfile with the merged desktop package manifest. The accidental remote .nvimlog artifact is excluded from the merge result. Constraint: Local main was 15 commits ahead and 8 commits behind origin/main after PR #217 was merged remotely Rejected: Fast-forward pull | local main had unpushed commits Rejected: Keep remote desktop lockfile verbatim | failed bun install --frozen-lockfile against the merged package.json Confidence: high Scope-risk: broad Directive: Keep provider-configured context windows ahead of OpenAI OAuth model windows so explicit user/provider settings win Tested: bun install --frozen-lockfile; cd desktop && bun install --frozen-lockfile; git diff --check; bun run check:server; bun run check:desktop; ALLOW_CLI_CORE_CHANGE=1 bun run quality:pr Not-tested: live provider OAuth login with a real OpenAI account