Merge origin/dev into fix/cliproxy-local-port-config

Resolve the dispatcher and dashboard conflicts from origin/dev while preserving the configured local CLIProxy port behavior. Also harden lifecycle port fallback and wait for the actual stopped port during binary installs.
This commit is contained in:
Tam Nhu Tran committed 2026-05-03 13:56:43 -04:00
commit a7c10be72e
181 files changed
+10100 -4308

No files matched your search

@@ -29,4 +29,12 @@ describe('resolveLifecyclePort', () => {
it('falls back to default port when config file is missing', () => {
expect(resolveLifecyclePort({})).toBe(CLIPROXY_DEFAULT_PORT);
});
it('falls back to default port when loading unified config throws', () => {
expect(
resolveLifecyclePort(undefined, () => {
throw new Error('malformed config');
})
).toBe(CLIPROXY_DEFAULT_PORT);
});
});