ai-remote 0.3.0 → 0.4.0

package/src/cli/native/window.swift

@@ -0,0 +1,151 @@
+// A standalone macOS window for the session viewer.
+//
+// No browser is involved: this is an NSWindow holding a WKWebView, which is the
+// WebKit that ships with the system. So the session gets a real application
+// window -- its own dock entry, the platform's own traffic lights, and the green
+// button doing native fullscreen -- without Chrome, without Electron, and
+// without a compiled dependency in the package.
+//
+// Built on first use by src/cli/native.ts and cached; the source is shipped
+// rather than a binary, so nothing here has to be trusted or code-signed.
+
+import AppKit
+import WebKit
+
+struct Options {
+  var url = ""
+  var title = "ai-remote"
+  var width: CGFloat = 1280
+  var height: CGFloat = 892
+  var fullscreen = false
+}
+
+func parse() -> Options {
+  var options = Options()
+  var arguments = Array(CommandLine.arguments.dropFirst())
+
+  while let argument = arguments.first {
+    arguments.removeFirst()
+    switch argument {
+    case "--title":      options.title = arguments.isEmpty ? options.title : arguments.removeFirst()
+    case "--width":      options.width = CGFloat(Double(arguments.removeFirst()) ?? 1280)
+    case "--height":     options.height = CGFloat(Double(arguments.removeFirst()) ?? 892)
+    case "--fullscreen": options.fullscreen = true
+    default:             if options.url.isEmpty { options.url = argument }
+    }
+  }
+  return options
+}
+
+final class Delegate: NSObject, NSApplicationDelegate, WKNavigationDelegate {
+  let options: Options
+  var window: NSWindow!
+  var web: WKWebView!
+
+  init(options: Options) {
+    self.options = options
+    super.init()
+  }
+
+  func applicationDidFinishLaunching(_ notification: Notification) {
+    let configuration = WKWebViewConfiguration()
+    // The viewer is served from loopback and talks to its own session; nothing
+    // it holds should outlive the window.
+    configuration.websiteDataStore = .nonPersistent()
+
+    web = WKWebView(frame: .zero, configuration: configuration)
+    web.navigationDelegate = self
+    web.setValue(false, forKey: "drawsBackground")
+
+    window = NSWindow(
+      contentRect: NSRect(x: 0, y: 0, width: options.width, height: options.height),
+      // .resizable is what puts the green button in the corner and lets it
+      // mean fullscreen rather than zoom.
+      styleMask: [.titled, .closable, .miniaturizable, .resizable],
+      backing: .buffered,
+      defer: false
+    )
+    window.title = options.title
+    window.contentView = web
+    window.setFrameAutosaveName("ai-remote-viewer")
+    window.collectionBehavior.insert(.fullScreenPrimary)
+    window.center()
+    window.makeKeyAndOrderFront(nil)
+
+    buildMenu()
+
+    if let url = URL(string: options.url) {
+      web.load(URLRequest(url: url))
+    } else {
+      FileHandle.standardError.write("ai-remote-window: not a URL: \(options.url)\n".data(using: .utf8)!)
+      exit(2)
+    }
+
+    if options.fullscreen {
+      // After the first frame, or the window has no screen to fill yet.
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) { self.window.toggleFullScreen(nil) }
+    }
+
+    NSApp.activate(ignoringOtherApps: true)
+  }
+
+  /// Enough of a menu for the shortcuts a window is expected to answer.
+  private func buildMenu() {
+    let main = NSMenu()
+
+    let appItem = NSMenuItem()
+    let appMenu = NSMenu()
+    appMenu.addItem(withTitle: "Hide \(options.title)", action: #selector(NSApplication.hide(_:)), keyEquivalent: "h")
+    appMenu.addItem(NSMenuItem.separator())
+    appMenu.addItem(withTitle: "Quit \(options.title)", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")
+    appItem.submenu = appMenu
+    main.addItem(appItem)
+
+    let viewItem = NSMenuItem()
+    let viewMenu = NSMenu(title: "View")
+    let full = NSMenuItem(title: "Enter Full Screen", action: #selector(NSWindow.toggleFullScreen(_:)), keyEquivalent: "f")
+    full.keyEquivalentModifierMask = [.command, .control]
+    viewMenu.addItem(full)
+    let reload = NSMenuItem(title: "Reload", action: #selector(WKWebView.reload(_:)), keyEquivalent: "r")
+    viewMenu.addItem(reload)
+    viewItem.submenu = viewMenu
+    main.addItem(viewItem)
+
+    let editItem = NSMenuItem()
+    let editMenu = NSMenu(title: "Edit")
+    for (title, action, key) in [
+      ("Cut", #selector(NSText.cut(_:)), "x"),
+      ("Copy", #selector(NSText.copy(_:)), "c"),
+      ("Paste", #selector(NSText.paste(_:)), "v"),
+      ("Select All", #selector(NSText.selectAll(_:)), "a"),
+    ] {
+      editMenu.addItem(withTitle: title, action: action, keyEquivalent: key)
+    }
+    editItem.submenu = editMenu
+    main.addItem(editItem)
+
+    NSApp.mainMenu = main
+  }
+
+  func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { true }
+
+  func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+    FileHandle.standardError.write("ai-remote-window: \(error.localizedDescription)\n".data(using: .utf8)!)
+  }
+
+  func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+    FileHandle.standardError.write("ai-remote-window: \(error.localizedDescription)\n".data(using: .utf8)!)
+  }
+}
+
+let options = parse()
+if options.url.isEmpty {
+  FileHandle.standardError.write("usage: ai-remote-window <url> [--title T] [--width N] [--height N] [--fullscreen]\n".data(using: .utf8)!)
+  exit(2)
+}
+
+let application = NSApplication.shared
+application.setActivationPolicy(.regular)
+let delegate = Delegate(options: options)
+application.delegate = delegate
+application.run()

package/src/cli/shell.ts

@@ -9,6 +9,19 @@
 import { SshSession } from '../protocols/ssh/session';
 import { TcpTransport } from './transport';
 
+/**
+ * The account name on its own.
+ *
+ * An RDP username may carry the machine or domain with it -- `DESKTOP-01\\owner`
+ * or `owner@corp` -- and SSH wants neither. The terminal defaults to the same
+ * account as the desktop, so this is what makes that default work rather than
+ * fail on a name that was perfectly good for RDP.
+ */
+export function bareUsername(username: string): string {
+  const withoutDomain = username.includes('\\') ? username.split('\\').pop()! : username;
+  return withoutDomain.split('@')[0].trim();
+}
+
 export interface ShellOptions {
   host: string;
   port: number;

package/src/cli/viewer-client/main.ts

@@ -21,17 +21,32 @@ const context = canvas.getContext('2d', { alpha: false })!;
 const stateEl = $('state');
 const sizeEl = $('size');
 const hostEl = $('host');
-const hintEl = $('hint');
-const fitBtn = $('fit');
+const scaleBtn = $('scale');
 const ctlBtn = $('control');
 const termBtn = $('term');
 const fsBtn = $('full');
+
+/**
+ * The toolbar has no room for a sentence, so a button's tooltip carries what a
+ * status line used to say.
+ */
+function tip(id: string, text: string): void {
+  const element = $(id);
+  element.title = text;
+  element.setAttribute('aria-label', text);
+}
 const termPane = $('terminal');
 const termHost = $('termHost');
 
 let control = false;
 let painted = 0;
 
+// The window hides its own titlebar on macOS and lets the page draw the bar,
+// which means leaving room for the traffic lights that float over it.
+if (/Mac|iPhone|iPad/.test(navigator.platform || navigator.userAgent)) {
+  document.body.classList.add('macos');
+}
+
 const socket = new WebSocket(location.href.replace(/^http/, 'ws'));
 socket.binaryType = 'arraybuffer';
 
@@ -115,13 +130,13 @@ termBtn.addEventListener('click', () => openTerminal(termBtn.getAttribute('aria-
 // --- the desktop ------------------------------------------------------------
 
 socket.addEventListener('open', () => {
-  stateEl.textContent = 'live';
-  stateEl.className = 'pill live';
+  stateEl.className = 'dot live';
+  stateEl.title = 'connected';
 });
 
 socket.addEventListener('close', () => {
-  stateEl.textContent = 'disconnected';
-  stateEl.className = 'pill dead';
+  stateEl.className = 'dot dead';
+  stateEl.title = 'the session ended';
   terminal.write('\r\n\x1b[31m[the session ended]\x1b[m\r\n');
 });
 
@@ -160,6 +175,7 @@ function resize({ width, height }: Json): void {
   canvas.width = width;
   canvas.height = height;
   sizeEl.textContent = `${width}×${height}`;
+  document.title = `${hostEl.textContent} — ${width}×${height}`;
 }
 
 /** Inflate with the platform's own decompressor; no library involved. */
@@ -237,14 +253,14 @@ canvas.addEventListener('keyup', (e) => {
 // rather than to the browser. Fit is forced on while it lasts, because a 1:1
 // desktop larger than the screen would otherwise be a fullscreen scrollbar.
 
-let fitBeforeFullscreen = true;
+let fitBeforeFullscreen = false;
 
 async function toggleFullscreen(): Promise<void> {
   if (document.fullscreenElement) {
     await document.exitFullscreen().catch(() => {});
     return;
   }
-  fitBeforeFullscreen = fitBtn.getAttribute('aria-pressed') === 'true';
+  fitBeforeFullscreen = scaleBtn.getAttribute('aria-pressed') === 'true';
   await document.documentElement.requestFullscreen({ navigationUI: 'hide' }).catch(() => {});
 }
 
@@ -274,11 +290,12 @@ window.addEventListener('keydown', (event) => {
 // --- controls ---------------------------------------------------------------
 
 function setFit(on: boolean): void {
-  fitBtn.setAttribute('aria-pressed', String(on));
+  scaleBtn.setAttribute('aria-pressed', String(on));
   canvas.classList.toggle('fit', on);
+  tip('scale', on ? 'Showing scaled to fit — click for 100%' : 'Showing at 100% — click to scale to fit');
 }
 
-fitBtn.addEventListener('click', () => setFit(fitBtn.getAttribute('aria-pressed') !== 'true'));
+scaleBtn.addEventListener('click', () => setFit(scaleBtn.getAttribute('aria-pressed') !== 'true'));
 
 // Ask; the server decides. The button reflects what came back, so it can never
 // claim control the session has not actually granted.
@@ -287,14 +304,20 @@ ctlBtn.addEventListener('click', () => send({ type: 'control', on: !control }));
 function setControl(on: boolean): void {
   control = on;
   ctlBtn.setAttribute('aria-pressed', String(on));
-  ctlBtn.textContent = on ? 'Release control' : 'Take control';
-  hintEl.textContent = on
-    ? 'You have control. Keyboard and pointer go to the remote machine.'
-    : 'Watching. The agent is driving — press “Take control” to send input yourself.';
+
+  tip('control', on
+    ? 'You have control — click to go back to watching'
+    : 'Watching. Click to send keyboard and pointer to the remote machine');
   if (on && !termPane.classList.contains('open')) canvas.focus();
 }
 
 $('cad').addEventListener('click', () => {
-  if (!control) { hintEl.textContent = 'Take control first — Ctrl+Alt+Del is input like any other.'; return; }
+  if (!control) {
+    tip('cad', 'Take control first — Ctrl+Alt+Del is input like any other');
+    return;
+  }
   send({ type: 'cad' });
 });
+
+// The desktop starts at 100%, and the window is sized to hold it.
+setFit(false);

package/src/cli/viewer-page.ts

@@ -1,100 +1,136 @@
 /**
- * The viewer page.
+ * The viewer page: markup, styling, and an icon.
  *
- * The markup and its styling live here; the behaviour is a real bundle, built
- * from src/cli/viewer-client and inlined at build time. A published CLI has no
- * asset directory it can rely on being unpacked beside it, so both arrive as
- * strings.
+ * The behaviour is a real bundle, built from src/cli/viewer-client and inlined
+ * here at build time. A published CLI has no asset directory it can rely on
+ * being unpacked beside it, so both arrive as strings.
  */
 
 import { VIEWER_CSS, VIEWER_JS } from './generated/viewer-bundle';
 
+/**
+ * A screen with a cursor on it. Drawn as one inline SVG so it can be the
+ * favicon, the tab icon and the title-bar glyph without a file anywhere.
+ */
+const ICON = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">`
+  + `<rect x="2" y="4" width="28" height="19" rx="3" fill="#1d2530" stroke="#4f8cf0" stroke-width="2"/>`
+  + `<path d="M11 27h10M16 23v4" stroke="#4f8cf0" stroke-width="2" stroke-linecap="round"/>`
+  + `<path d="M9 9l6 9 1.6-3.6L20 13z" fill="#7ee2a8"/>`
+  + `</svg>`;
+
+const FAVICON = `data:image/svg+xml,${encodeURIComponent(ICON)}`;
+
+/** One toolbar button: an icon, a tooltip, and nothing else. */
+const button = (id: string, title: string, path: string, pressed?: boolean) =>
+  `<button id="${id}" title="${title}" aria-label="${title}"`
+  + `${pressed === undefined ? '' : ` aria-pressed="${pressed}"`}>`
+  + `<svg viewBox="0 0 24 24" aria-hidden="true">${path}</svg></button>`;
+
+// 24x24 stroke glyphs, so they all sit on the same optical weight.
+const GLYPH = {
+  scale: '<path d="M4 9V5a1 1 0 011-1h4M20 15v4a1 1 0 01-1 1h-4M9 20H5a1 1 0 01-1-1v-4M15 4h4a1 1 0 011 1v4"/>',
+  fullscreen: '<path d="M4 9V4h5M15 4h5v5M20 15v5h-5M9 20H4v-5"/>',
+  control: '<path d="M6 3l12 7-5 1.5L15.5 17l-2 1-2.5-5.5L7 16z"/>',
+  terminal: '<rect x="3" y="4" width="18" height="16" rx="2"/><path d="M7 9l2.5 2.5L7 14M12.5 14.5H17"/>',
+  keys: '<rect x="2" y="6" width="20" height="12" rx="2"/><path d="M6 10h.01M10 10h.01M14 10h.01M18 10h.01M7 14h10"/>',
+};
+
 export const PAGE = `<!doctype html>
 <html lang="en">
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>ai-remote viewer</title>
+<title>ai-remote</title>
+<link rel="icon" href="${FAVICON}">
 <style>
   :root { color-scheme: dark; }
   * { box-sizing: border-box; }
   body {
     margin: 0; height: 100vh; display: flex; flex-direction: column;
-    background: #12141a; color: #e6e8ee;
-    font: 13px/1.5 ui-sans-serif, -apple-system, "Segoe UI", system-ui, sans-serif;
+    background: #0f1116; color: #e6e8ee; overflow: hidden;
+    font: 12px/1.4 ui-sans-serif, -apple-system, "Segoe UI", system-ui, sans-serif;
   }
+
+  /* One compact strip: the icon, what this is, and the controls. Nothing
+     below the desktop, so the window is the desktop plus 34 pixels. */
   header {
-    display: flex; align-items: center; gap: 12px; flex-wrap: wrap;
-    padding: 8px 12px; background: #181b21; border-bottom: 1px solid #262b34;
+    display: flex; align-items: center; gap: 6px; height: 34px; flex: 0 0 34px;
+    padding: 0 8px; background: #171a21; border-bottom: 1px solid #242a34;
+    -webkit-user-select: none; user-select: none;
   }
-  header .title { font-weight: 600; }
+  /* The window's traffic lights are drawn over this strip, so the left end has
+     to get out of their way. Set from the platform by the viewer bundle. */
+  body.macos header { padding-left: 78px; }
+  /* The top of the strip is the system's drag region: content there belongs to
+     the window, not to the page, so nothing interactive is put in it. */
+  body.macos header .controls { align-self: flex-end; padding-bottom: 4px; }
+  header .mark { width: 16px; height: 16px; flex: 0 0 16px; opacity: .95; }
+  header .mark svg { width: 100%; height: 100%; display: block; }
+  header .where { color: #aeb6c4; font-variant-numeric: tabular-nums; white-space: nowrap; }
+  header .where b { color: #e6e8ee; font-weight: 600; }
   header .spacer { flex: 1; }
-  .pill {
-    padding: 2px 8px; border-radius: 999px; background: #22272f;
-    border: 1px solid #2f353f; font-variant-numeric: tabular-nums; font-size: 12px;
-  }
-  .pill.live { color: #7ee2a8; border-color: #2c5540; }
-  .pill.dead { color: #ff9b9b; border-color: #5c3131; }
+
+  header .controls { display: flex; align-items: center; gap: 2px; }
+  .dot { width: 7px; height: 7px; border-radius: 50%; background: #5a6472; flex: 0 0 7px; }
+  .dot.live { background: #7ee2a8; box-shadow: 0 0 6px rgba(126,226,168,.7); }
+  .dot.dead { background: #ff8080; }
+
   button {
-    font: inherit; color: inherit; background: #22272f; cursor: pointer;
-    border: 1px solid #2f353f; border-radius: 6px; padding: 4px 10px;
+    display: grid; place-items: center; width: 26px; height: 24px; padding: 0;
+    color: #aeb6c4; background: none; border: 1px solid transparent;
+    border-radius: 5px; cursor: pointer;
+  }
+  button svg {
+    width: 15px; height: 15px; fill: none; stroke: currentColor;
+    stroke-width: 1.7; stroke-linecap: round; stroke-linejoin: round;
   }
-  button:hover { background: #2c323c; }
-  button[aria-pressed="true"] { background: #2f4a7a; border-color: #3f63a4; }
-  .body { flex: 1; min-height: 0; display: flex; flex-direction: column; }
+  button#control svg { fill: currentColor; stroke: none; }
+  button:hover { color: #e6e8ee; background: #232936; }
+  button[aria-pressed="true"] { color: #fff; background: #2f5fb0; border-color: #3f74d0; }
+
   main {
     flex: 1; min-height: 0; display: grid; place-items: center;
-    overflow: auto; padding: 12px;
+    overflow: auto; background: #07080b;
   }
-  canvas { display: block; background: #000; box-shadow: 0 10px 30px rgba(0,0,0,.8); outline: none; }
+  /* 100% by default: a remote pixel is a real pixel unless asked otherwise. */
+  canvas { display: block; background: #000; outline: none; image-rendering: auto; }
   canvas.fit { max-width: 100%; max-height: 100%; object-fit: contain; }
+
   #terminal {
-    display: none; min-height: 0; height: 40%;
-    border-top: 1px solid #262b34; background: #0d0f13; padding: 6px 8px 2px;
+    display: none; min-height: 0; height: 38%; flex: 0 0 38%;
+    border-top: 1px solid #242a34; background: #0b0d11; padding: 4px 6px 0;
   }
   #terminal.open { display: block; }
   #termHost { height: 100%; }
-  footer { padding: 6px 12px; background: #181b21; border-top: 1px solid #262b34; color: #97a0b0; }
 
-  /* Fullscreen: the desktop, and nothing else. The header stays reachable by
-     moving the pointer to the top edge, so control and the terminal are not
-     lost behind a keystroke nobody can guess. */
-  body.fullscreen { background: #000; }
-  body.fullscreen main { padding: 0; }
-  body.fullscreen footer { display: none; }
-  body.fullscreen canvas { box-shadow: none; }
+  /* Fullscreen: the desktop and nothing else, with the strip a pointer-flick
+     away at the top edge rather than gone for good. */
+  body.fullscreen main { background: #000; }
   body.fullscreen header {
     position: fixed; inset: 0 0 auto 0; z-index: 10;
-    background: rgba(24, 27, 33, .94); border-bottom-color: rgba(38, 43, 52, .9);
-    transform: translateY(-100%); transition: transform .18s ease;
-  }
-  body.fullscreen header:hover,
-  body.fullscreen header:focus-within { transform: none; }
-  body.fullscreen::before {
-    content: ''; position: fixed; inset: 0 0 auto 0; height: 8px; z-index: 9;
+    background: rgba(23, 26, 33, .95);
+    transform: translateY(-100%); transition: transform .16s ease;
   }
-  body.fullscreen:has(header:hover)::before { height: 0; }
+  body.fullscreen header:hover, body.fullscreen header:focus-within { transform: none; }
 ${VIEWER_CSS}
 </style>
 </head>
 <body>
 <header>
-  <span class="title">ai-remote</span>
-  <span class="pill" id="host">—</span>
-  <span class="pill" id="size">—</span>
-  <span class="pill" id="state">connecting…</span>
+  <span class="mark">${ICON}</span>
+  <span class="where"><b id="host">—</b> <span id="size"></span></span>
+  <span class="dot" id="state" title="connecting"></span>
   <span class="spacer"></span>
-  <button id="fit" aria-pressed="true">Fit</button>
-  <button id="full" aria-pressed="false" title="Fullscreen (Ctrl+Shift+F, Escape to leave)">Fullscreen</button>
-  <button id="control" aria-pressed="false" title="While off, you watch without sending input">Take control</button>
-  <button id="term" aria-pressed="false">Terminal</button>
-  <button id="cad">Ctrl+Alt+Del</button>
+  <span class="controls">
+    ${button('scale', 'Scale to fit / 100%', GLYPH.scale, false)}
+    ${button('full', 'Fullscreen', GLYPH.fullscreen, false)}
+    ${button('control', 'Take control', GLYPH.control, false)}
+    ${button('term', 'Terminal', GLYPH.terminal, false)}
+    ${button('cad', 'Ctrl+Alt+Del', GLYPH.keys)}
+  </span>
 </header>
-<div class="body">
-  <main><canvas id="screen" class="fit" tabindex="0"></canvas></main>
-  <section id="terminal"><div id="termHost"></div></section>
-</div>
-<footer id="hint">Watching. The agent is driving — press “Take control” to send input yourself.</footer>
+<main><canvas id="screen" tabindex="0"></canvas></main>
+<section id="terminal"><div id="termHost"></div></section>
 <script type="module">
 ${VIEWER_JS}
 </script>

package/src/cli/viewer.ts

@@ -14,18 +14,22 @@
 import { createServer } from 'node:http';
 import type net from 'node:net';
 import { randomBytes } from 'node:crypto';
-import { spawn } from 'node:child_process';
 import { deflateSync } from 'node:zlib';
 import type { RdpSession } from './session';
 import type { Shell } from './shell';
 import { accept, type WebSocketPeer } from './wsserver';
+import { openWindow, type WindowHandle } from './window';
 import { PAGE } from './viewer-page';
 
 export interface Viewer {
   url: string;
-  /** Resolves when a browser has actually attached. */
+  /** Resolves when something has actually attached and asked for pixels. */
   opened: Promise<void>;
-  /** Pop the window again, for a viewer that was closed by hand. */
+  /** How the window was opened, for the message the command prints. */
+  window: WindowHandle | null;
+  /** How many viewers are attached right now. Zero is a normal state. */
+  readonly viewers: number;
+  /** Open the window again, for one that was closed by hand. */
   launch(): void;
   close(): void;
 }
@@ -49,7 +53,19 @@ function encodeRect(kind: number, left: number, top: number, width: number, heig
 export async function startViewer(
   session: RdpSession,
   port: number,
-  { launch = true, openShell }: { launch?: boolean; openShell?: () => Promise<Shell> } = {}
+  {
+    launch = true,
+    openShell,
+    tab = false,
+    fullscreen = false,
+    title,
+  }: {
+    launch?: boolean;
+    openShell?: () => Promise<Shell>;
+    tab?: boolean;
+    fullscreen?: boolean;
+    title?: string;
+  } = {}
 ): Promise<Viewer> {
   const token = randomBytes(16).toString('hex');
   const peers = new Set<WebSocketPeer>();
@@ -76,7 +92,10 @@ export async function startViewer(
    */
   async function attachShell(peer: WebSocketPeer): Promise<void> {
     if (!openShell) {
-      peer.send(JSON.stringify({ type: 'shell-error', message: 'This session was started without a terminal. Restart it with --ssh-user NAME.' }));
+      peer.send(JSON.stringify({
+        type: 'shell-error',
+        message: 'This session has no terminal available.',
+      }));
       return;
     }
     if (detachShell.has(peer)) return;
@@ -217,15 +236,36 @@ export async function startViewer(
   });
 
   const url = `http://127.0.0.1:${bound}/?t=${token}`;
-  if (launch) open(url);
+
+  /**
+   * The window is sized to hold the desktop at 100% plus the toolbar strip, so
+   * nothing is scaled down until somebody asks for it.
+   */
+  const TOOLBAR = 34;
+  const show = (): WindowHandle => openWindow({
+    url,
+    title: title ?? `ai-remote — ${session.options.host}`,
+    width: session.framebuffer.width || session.options.width,
+    height: (session.framebuffer.height || session.options.height) + TOOLBAR,
+    fullscreen,
+    tab,
+  });
+
+  let window = launch ? show() : null;
 
   return {
     url,
     opened,
-    launch() { open(url); },
+    get window() { return window; },
+    get viewers() { return peers.size; },
+    launch() { window = show(); },
     close() {
       for (const peer of peers) peer.close();
       server.close();
+      // The window is its own process; closing the server would leave it
+      // staring at a socket that is not there.
+      if (window?.pid) { try { process.kill(window.pid); } catch { /* already gone */ } }
+      window = null;
     },
   };
 }
@@ -254,16 +294,3 @@ function applyInput(session: RdpSession, message: any): void {
       break;
   }
 }
-
-/** Pop the window. A failure here is not a failure of the session. */
-function open(url: string): void {
-  const command = process.platform === 'darwin' ? 'open'
-    : process.platform === 'win32' ? 'cmd'
-    : 'xdg-open';
-  const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
-  try {
-    spawn(command, args, { stdio: 'ignore', detached: true }).unref();
-  } catch {
-    // Headless, or no browser. The URL was printed; that is enough.
-  }
-}