@volter/supercode-teams 0.2.80 → 0.2.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "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'),
@@ -85,11 +85,26 @@ 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). Evidence stops at 2x: at 1x the same factors
+  // predict 7 x 16 px where Terminal.app draws 7 x 15.
   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 lines = [
@@ -100,14 +115,14 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
     "local appearance = wezterm.gui and wezterm.gui.get_appearance() or 'Dark'",
     "config.colors = appearance:find('Dark') and schemes.dark or schemes.light",
     `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 +134,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).