@volter/supercode-teams 0.2.80 → 0.2.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.80",
+  "version": "0.2.82",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",

package/terminal-look.mjs

@@ -45,7 +45,7 @@ function run() {
   const font = archived('Font');
   return JSON.stringify({
     name, colors,
-    font: font && !font.isNil() ? { family: ObjC.unwrap(font.familyName), size: font.pointSize, lineHeight: $.NSLayoutManager.alloc.init.defaultLineHeightForFont(font), ascender: font.ascender, descender: font.descender } : null,
+    font: font && !font.isNil() ? { family: ObjC.unwrap(font.familyName), size: font.pointSize, advance: font.advancementForGlyph(font.glyphWithName('M')).width, ascender: font.ascender, descender: font.descender, leading: font.leading } : null,
     widthSpacing: value('FontWidthSpacing'), heightSpacing: value('FontHeightSpacing'),
     cursorType: value('CursorType'), cursorBlink: value('CursorBlink'), optionIsMeta: value('useOptionAsMetaKey'),
     bell: value('Bell'), visualBell: value('VisualBell'), brightBold: value('UseBrightBold'),
@@ -53,6 +53,38 @@ function run() {
   });
 }`;
 
+// AppKit's conversion of sRGB colours into each screen's colour space, keyed by the screen's scale. WezTerm writes its
+// colours to the screen unconverted, where Terminal.app's are colour-managed: on the owner's external monitor Clear
+// Dark's ground #212734 reached the glass as #212734 from WezTerm and as #1e242d from Terminal.app (#1d232d is AppKit's
+// conversion), so every colour looked lighter and bluer. Two screens at one scale share the main screen's conversion.
+const CONVERT_COLOURS = `
+ObjC.import('AppKit');
+function run(argv) {
+  const hexes = JSON.parse(argv[0]);
+  const two = (v) => Math.round(Math.min(1, Math.max(0, v)) * 255).toString(16).padStart(2, '0');
+  const screens = $.NSScreen.screens, out = [];
+  for (let i = 0; i < screens.count; i++) {
+    const screen = screens.objectAtIndex(i), space = screen.colorSpace, map = {};
+    for (const hex of hexes) {
+      const [r, g, b] = [1, 3, 5].map((k) => parseInt(hex.slice(k, k + 2), 16) / 255);
+      const c = $.NSColor.colorWithSRGBRedGreenBlueAlpha(r, g, b, 1).colorUsingColorSpace(space);
+      map[hex] = '#' + two(c.redComponent) + two(c.greenComponent) + two(c.blueComponent);
+    }
+    out.push({ scale: screen.backingScaleFactor, map });
+  }
+  return JSON.stringify(out);
+}`;
+
+/** Each screen's conversion of `hexes` ([{ scale, map: { hex: hex } }], the main screen first); [] off macOS. */
+export function screenColours(hexes, platform = process.platform) {
+  if (platform !== 'darwin' || !hexes.length) return [];
+  try {
+    return JSON.parse(execFileSync('osascript', ['-l', 'JavaScript', '-e', CONVERT_COLOURS, JSON.stringify(hexes)], { encoding: 'utf8', timeout: 5_000, stdio: ['ignore', 'pipe', 'ignore'] }));
+  } catch {
+    return [];
+  }
+}
+
 /** This machine's Terminal.app default profile, as read by AppKit; null off macOS or when it cannot be read. */
 export function terminalAppProfile(platform = process.platform) {
   if (platform !== 'darwin') return null;
@@ -67,7 +99,7 @@ const hex = ([r, g, b]) => `#${[r, g, b].map((part) => Math.round(Math.min(1, Ma
 const lua = (value) => (typeof value === 'string' ? JSON.stringify(value) : String(value));
 
 /** WezTerm's config (Lua) for a window that looks like Terminal.app with `profile` (from terminalAppProfile, or null). */
-export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ? [TERMINAL_FONTS] : [] } = {}) {
+export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ? [TERMINAL_FONTS] : [], screens = [] } = {}) {
   const mac = fontDirs.length > 0;
   const stored = profile?.colors ?? {};
   // One colour table per appearance: the profile's colour where it stores one, else Basic's for that appearance.
@@ -85,29 +117,63 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
     };
   };
   const table = (colors) => `{\n${Object.entries(colors).map(([key, value]) => `    ${key} = ${Array.isArray(value) ? `{ ${value.map(lua).join(', ')} }` : lua(value)},`).join('\n')}\n  }`;
-  const families = mac ? [...new Set([profile?.font?.family ?? 'SF Mono Terminal', ...MAC_CASCADE])] : [];
-  // A row is AppKit's line height for the face (Terminal.app's), where WezTerm's is the face's ascent plus descent.
+  // Terminal.app's face drawn by CoreText is heavier than the same face drawn by WezTerm's FreeType: on the same Retina
+  // display, SF Mono Terminal 12 put 14432 of ink per cell in Terminal.app, 12043 at Medium and 15864 at DemiBold in
+  // WezTerm (Regular: 72%). DemiBold is the nearest; bold text takes the face's Bold in both (94%).
+  const primary = `{ family = ${lua(profile?.font?.family ?? 'SF Mono Terminal')}, weight = 'DemiBold' }`;
+  const families = mac ? [primary, ...MAC_CASCADE.map(lua)] : [];
+  // Terminal.app's cell is whole points: the advance rounded down (7 pt for SF Mono Terminal 12's 7.418) and the line
+  // (ascent + descent + leading) rounded up (15 pt for 14.32), measured as 14 x 30 px on a Retina display. WezTerm rounds
+  // its cell up to whole pixels before and after these factors, so the width factor is floor/ceil of the advance (14 px
+  // at 2x) and the height factor lands on the doubled line at 2x (30 px). Measured on both of the owner's displays: 14 x
+  // 30 px at 2x and 7 x 15 px at 1x, the same as Terminal.app's.
   const font = profile?.font;
-  const rowScale = font?.lineHeight && font.ascender - font.descender > 0 ? font.lineHeight / (font.ascender - font.descender) : 1;
-  const opacity = stored.BackgroundColor?.[3] ?? 1;
+  const advance = (font?.advance ?? 0) * (profile?.widthSpacing ?? 1);
+  const cellWidth = advance > 0 ? Math.floor(advance) / Math.ceil(advance) : 1;
+  const height = font ? font.ascender - font.descender + (font.leading ?? 0) : 0;
+  const lineHeight = height > 0 ? (2 * Math.ceil(height) - 0.5) / Math.ceil(2 * height) : 1;
+  // Terminal.app's translucent, blurred ground at 0.95 rendered within 2 levels of the opaque colour; WezTerm's at 0.95
+  // rendered 8 levels lighter over the same desktop. So a nearly opaque profile is drawn opaque (below 0.9 the profile's
+  // opacity is kept: unmeasured).
+  const alpha = stored.BackgroundColor?.[3] ?? 1;
+  const opacity = alpha >= 0.9 ? 1 : alpha;
   const cursorShape = ['Block', 'Underline', 'Bar'][profile?.cursorType ?? 0] ?? 'Block';
   const composed = !profile?.optionIsMeta;
+  const light = scheme(TERMINAL_BASIC.light), dark = scheme(TERMINAL_BASIC.dark);
+  const convert = (colors, map) => Object.fromEntries(Object.entries(colors).map(([key, value]) => [key, Array.isArray(value) ? value.map((v) => map[v] ?? v) : map[value] ?? value]));
+  const entry = (key, map) => `  ${key} = { light = ${table(convert(light, map))}, dark = ${table(convert(dark, map))} },`;
+  const byScale = new Map();
+  for (const screen of screens) if (!byScale.has(screen.scale)) byScale.set(screen.scale, screen.map);
+  const palettes = [entry('main', screens[0]?.map ?? {}), ...[...byScale].map(([scale, map]) => entry(`[${scale}]`, map))].join('\n');
   const lines = [
     '-- Generated by supercode (sdk/teams/terminal-look.mjs): this window looks like Terminal.app' + (profile?.name ? ` with this machine's "${profile.name}" profile.` : "'s Basic profile."),
     "local wezterm = require 'wezterm'",
     'local config = wezterm.config_builder()',
-    `local schemes = {\n  light = ${table(scheme(TERMINAL_BASIC.light))},\n  dark = ${table(scheme(TERMINAL_BASIC.dark))},\n}`,
+    `local palettes = {\n${palettes}\n}`,
     "local appearance = wezterm.gui and wezterm.gui.get_appearance() or 'Dark'",
-    "config.colors = appearance:find('Dark') and schemes.dark or schemes.light",
+    "local function colours(scale) local p = palettes[scale] or palettes.main; return appearance:find('Dark') and p.dark or p.light end",
+    'config.colors = colours()',
+    // A window takes the palette converted for the screen it is on (by its scale), when it opens and when it moves.
+    'local shown = {}',
+    'local function fit(window)',
+    '  local scale = math.floor(window:get_dimensions().dpi / 72 + 0.5)',
+    '  if shown[window:window_id()] == scale then return end',
+    '  shown[window:window_id()] = scale',
+    '  local overrides = window:get_config_overrides() or {}',
+    '  overrides.colors = colours(scale)',
+    '  window:set_config_overrides(overrides)',
+    'end',
+    "wezterm.on('window-config-reloaded', fit)",
+    "wezterm.on('window-resized', fit)",
     `config.font_dirs = { ${fontDirs.map(lua).join(', ')} }`,
-    ...(families.length ? [`config.font = wezterm.font_with_fallback({ ${families.map(lua).join(', ')} })`] : []),
+    ...(families.length ? [`config.font = wezterm.font_with_fallback({ ${families.join(', ')} })`] : []),
     // CoreText draws glyphs unhinted; FreeType's default hinting snaps their outlines to the pixel grid.
     "config.freetype_load_flags = 'NO_HINTING'",
     // Box and block characters are the face's own glyphs, as CoreText draws them, not WezTerm's drawn lines.
     'config.custom_block_glyphs = false',
     `config.font_size = ${profile?.font?.size ?? TERMINAL_BASIC.fontSize}`,
-    `config.cell_width = ${profile?.widthSpacing ?? 1}`,
-    `config.line_height = ${Number(((profile?.heightSpacing ?? 1) * rowScale).toFixed(4))}`,
+    `config.cell_width = ${Number(cellWidth.toFixed(4))}`,
+    `config.line_height = ${Number(((profile?.heightSpacing ?? 1) * lineHeight).toFixed(4))}`,
     `config.default_cursor_style = ${lua(`${profile?.cursorBlink ? 'Blinking' : 'Steady'}${cursorShape}`)}`,
     `config.send_composed_key_when_left_alt_is_pressed = ${composed}`,
     `config.send_composed_key_when_right_alt_is_pressed = ${composed}`,
@@ -119,8 +185,8 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
     `config.macos_window_background_blur = ${opacity < 1 ? Math.round((profile?.blur ?? 0) * 40) : 0}`,
     `config.initial_cols = ${profile?.columns ?? 80}`,
     `config.initial_rows = ${profile?.rows ?? 24}`,
-    // Terminal.app's margin around the text is not measured; this padding is an estimate.
-    'config.window_padding = { left = 4, right = 4, top = 2, bottom = 2 }',
+    // Terminal.app's text starts 11 pt from the window's edge (22 px at 2x, one point of it the glyph's own bearing).
+    "config.window_padding = { left = '10pt', right = '10pt', top = 2, bottom = 2 }",
     'config.hide_tab_bar_if_only_one_tab = true',
     'config.enable_scroll_bar = false',
     // Terminal.app does not ask before closing a window whose process is tmux (its default "ask before closing" list).
@@ -149,7 +215,10 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
 /** Writes the config for this machine, when it differs from the one on disk, and returns its path. */
 export function weztermConfigFile(platform = process.platform) {
   const path = join(tmpdir(), `supercode-wezterm-${process.getuid?.() ?? 'user'}.lua`);
-  const config = weztermConfig(terminalAppProfile(platform));
+  const profile = terminalAppProfile(platform);
+  const plain = weztermConfig(profile);
+  const hexes = [...new Set(plain.match(/#[0-9a-f]{6}/g) ?? [])];
+  const config = weztermConfig(profile, { screens: screenColours(hexes, platform) });
   let current = null;
   try { current = readFileSync(path, 'utf8'); } catch { /* not written yet */ }
   if (current === config) return path;