Skip to content

fix(desktop): follow-up review fixes from #8896 #8951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiliang114 merged 6 commits into from
Aug 12, 2026
Merged

fix(desktop): follow-up review fixes from #8896 #8951

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75f757d
fix(desktop): follow-up fixes from #8896 review
yiliang114 Aug 11, 2026
b9ebc44
docs(desktop-shell): add debugging section to README
yiliang114 Aug 12, 2026
360ff38
fix(webui): remove dead error write in retriable reconnect path, add …
yiliang114 Aug 12, 2026
012690f
test(webui): pin stale error clearing during reconnect
yiliang114 Aug 12, 2026
a541f7a
test(webui): satisfy reconnect generator lint
yiliang114 Aug 12, 2026
fa29c34
Merge remote-tracking branch 'origin/main' into HEAD
yiliang114 Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/acp-bridge/src/bridge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4485,6 +4485,7 @@ describe('createAcpSessionBridge', () => {
hasMore: false,
});

await expect(refresh).rejects.toBeInstanceOf(SessionNotFoundError);
await expect(refresh).rejects.toMatchObject({
code: 'session_closing',
});
Expand Down
11 changes: 4 additions & 7 deletions packages/desktop-shell/bootstrap/local-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const messages = {
on: 'On',
inactiveCopy:
'Turn this on, then scan from a phone on the same trusted Wi-Fi.',
inactiveNotice: 'Uses unencrypted HTTP. Phone access stays closed until enabled.',
inactiveNotice:
'Uses unencrypted HTTP. Phone access stays closed until enabled.',
qrLabel: 'Local Control QR code',
turnOn: 'Turn on Local Control',
disconnect: 'Disconnect phone access',
Expand All @@ -46,9 +47,7 @@ const messages = {
},
};

const language = navigator.language.toLowerCase().startsWith('zh')
? 'zh-CN'
: 'en';
const language = navigator.language.toLowerCase() === 'zh-cn' ? 'zh-CN' : 'en';
Comment thread
yiliang114 marked this conversation as resolved.
Resolved
const t = (key) => messages[language][key];

document.documentElement.lang = language;
Expand All @@ -70,9 +69,7 @@ function render(state) {
toggle.className = enabled ? 'stop' : '';
qr.innerHTML = enabled ? state.qrSvg || '' : '';
url.textContent = enabled ? state.url || '' : '';
sleep.textContent = state.sleepInhibited
? t('awake')
: t('maySleep');
sleep.textContent = state.sleepInhibited ? t('awake') : t('maySleep');
error.hidden = true;
error.textContent = '';
}
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-shell/src-tauri/src/local_control.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const MAX_CONNECTIONS: usize = 64;
const HEADER_TIMEOUT: Duration = Duration::from_secs(10);
static NEXT_CONNECTION_ID: AtomicU64 = AtomicU64::new(1);

#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
struct LocalNetwork {
address: Ipv4Addr,
netmask: Ipv4Addr,
Expand Down
1 change: 1 addition & 0 deletions packages/webui/src/daemon/session/DaemonSessionProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2943,6 +2943,7 @@ export function DaemonSessionProvider(props: DaemonSessionProviderProps) {
setConnection((current) => ({
...current,
status: 'disconnected',
error: undefined,
}));
await delay(delayMs, abort.signal);
}
Expand Down
Loading