mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
8a5b3467c5
Remote main carries portable-mode, legacy Windows workdir recovery, and Feishu path-safety fixes while local main carries terminal shell, update proxy, slash-command, prompt-draft, AskUserQuestion, background-work, and shell-env changes. This merge keeps both lines by layering portable Bash-path defaults underneath the desktop terminal shell preference and preserving both update-proxy and app-mode settings state. Constraint: Local main and origin/main diverged after v0.2.7 and both lines contain release-relevant desktop/runtime fixes Rejected: Prefer either side's terminal settings wholesale | would drop either Windows portable Bash support or explicit desktop startup-shell support Confidence: medium Scope-risk: moderate Directive: Keep portable Bash path as the system-default terminal fallback; explicit desktop startup-shell settings should continue to override it Tested: cd desktop && bun run test -- --run src/pages/TerminalSettings.test.tsx src/stores/settingsStore.test.ts Tested: cd desktop/src-tauri && cargo test terminal -- --nocapture Tested: bun test src/server/__tests__/sessions.test.ts -t stale worktree Tested: bun run check:desktop Tested: bun run check:server Tested: bun run check:native Not-tested: Manual Windows packaged-app terminal/portable smoke
