Skip to content

Node-based terminal manager for AI coding agents — tmux-backed terminals and parallel agent sessions as draggable nodes on an infinite pan/zoom canvas. macOS, Linux, and a browser Server Edition.

Merge origin/main into fix/win-pairing-remote-login (import-only conflicts, both kept)

enesbdadbc3d1c8d
diff --cc src/main/index.ts
index 42791cc36,d104970e0..c6e097060
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@@ -18,7 -18,7 +18,8 @@@ installLogSink(logBuffer
import { writeFilesToClipboard } from './clipboard-files'
import { pickProjectIcon } from './project-icon-upload'
import { allowGuestNavigation } from './webview-nav'
+import { hostOsFromPlatform, sshServerCopy } from '../shared/ssh-server'
+ import { macTitleBarOptions } from './window-chrome'
import { guestContextMenuTemplate } from './webview-context-menu'
import { BrowserControlLedger } from './browser-control-ledger'
import {
diff --cc src/renderer/components/PhonePairPopover.tsx
index b614ed016,d6c3fa546..b02b8a53e
--- a/src/renderer/components/PhonePairPopover.tsx
+++ b/src/renderer/components/PhonePairPopover.tsx
@@@ -4,10 -4,9 +4,11 @@@ import { Switch } from '@renderer/ui/Sw
import { useSettings } from '@renderer/state/settings'
import { usePhonePairing } from './settings/usePhonePairing'
import { IOS_APP_STORE_URL } from '@renderer/lib/links'
+import { hostOsFromNavigator, sshServerCopy } from '@shared/ssh-server'
+ import { thisMachine } from '@renderer/lib/machineName'
-const isMac = /Mac/i.test(navigator.platform || navigator.userAgent)
+/** Same table the Phone settings section prints from — see @shared/ssh-server. */
+const sshServer = sshServerCopy(hostOsFromNavigator())
/**
* Quick phone pairing, anchored under the top-right phone button: opens straight into a live QR
@@@ -100,13 -98,11 +101,13 @@@ export function PhonePairPopover(
</div>
) : !phoneAccessEnabled ? (
<div className="phone-pair__warn">
- LAN-only code: the phone will reach this Mac only on this network. Flip the
- toggle below first to also connect from anywhere — the QR refreshes by itself.
+ LAN-only code: the phone will reach {thisMachine()} only on this network. Flip
+ the toggle below first to also connect from anywhere — the QR refreshes by itself.
</div>
) : null}
- {sshHealed ? <div className="phone-pair__ok">✓ Remote Login is on.</div> : null}
+ {sshHealed ? (
+ <div className="phone-pair__ok">✓ {sshServer.name} is on.</div>
+ ) : null}
</>
)
) : phase === 'paired' ? (
diff --cc src/renderer/components/settings/sections/PhoneSection.tsx
index f4c50d293,01632728c..ad72b58c4
--- a/src/renderer/components/settings/sections/PhoneSection.tsx
+++ b/src/renderer/components/settings/sections/PhoneSection.tsx
@@@ -8,7 -8,7 +8,8 @@@ import { Switch } from '@renderer/ui/Sw
import { useSettings } from '@renderer/state/settings'
import { usePhonePairing } from '../usePhonePairing'
import { IOS_APP_STORE_URL } from '@renderer/lib/links'
+import { hostOsFromNavigator, sshServerCopy } from '@shared/ssh-server'
+ import { thisMachine } from '../../../lib/machineName'
const ROWS = {
remote: {