@volter/supercode-teams 0.2.70 → 0.2.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.70",
+  "version": "0.2.71",
   "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

@@ -11,6 +11,11 @@ import { join } from 'node:path';
 import { TERMINAL_BASIC } from './terminal-basic.mjs';
 
 const TERMINAL_FONTS = '/System/Applications/Utilities/Terminal.app/Contents/Resources/Fonts';
+// Where CoreText finds a glyph Terminal.app's face lacks, in its order (CTFontCopyDefaultCascadeListForLanguages for
+// SFMonoTerminal-Regular, then the faces it picked for ⎿ and ⏺ on macOS 26): WezTerm's own fallbacks come after.
+// CoreText's cascade holds a subset of Apple Symbols (.AppleSymbolsFB) that lacks ⎿, which it draws from Hiragino
+// Sans; WezTerm reads the whole face, so Apple Symbols comes after the faces CoreText reached first.
+const MAC_CASCADE = ['Menlo', 'Monaco', 'Courier New', 'Helvetica', 'Lucida Grande', 'PingFang SC', 'Hiragino Sans', 'STIX Two Math', 'Apple Symbols', 'Apple Color Emoji'];
 const ANSI = ['Black', 'Red', 'Green', 'Yellow', 'Blue', 'Magenta', 'Cyan', 'White'];
 
 // Runs in osascript's JavaScript for Automation with the Objective-C bridge: no Apple Event is sent, so no automation
@@ -40,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 } : null,
+    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,
     widthSpacing: value('FontWidthSpacing'), heightSpacing: value('FontHeightSpacing'),
     cursorType: value('CursorType'), cursorBlink: value('CursorBlink'), optionIsMeta: value('useOptionAsMetaKey'),
     bell: value('Bell'), visualBell: value('VisualBell'), brightBold: value('UseBrightBold'),
@@ -63,6 +68,7 @@ const lua = (value) => (typeof value === 'string' ? JSON.stringify(value) : Stri
 
 /** 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] : [] } = {}) {
+  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.
   const scheme = (basic) => {
@@ -79,7 +85,10 @@ 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 = [...new Set([profile?.font?.family, 'SF Mono Terminal', 'SF Mono', 'Menlo'].filter(Boolean))];
+  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.
+  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 cursorShape = ['Block', 'Underline', 'Bar'][profile?.cursorType ?? 0] ?? 'Block';
   const composed = !profile?.optionIsMeta;
@@ -91,10 +100,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(', ')} }`,
-    `config.font = wezterm.font_with_fallback({ ${families.map(lua).join(', ')} })`,
+    ...(families.length ? [`config.font = wezterm.font_with_fallback({ ${families.map(lua).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 = ${profile?.heightSpacing ?? 1}`,
+    `config.line_height = ${Number(((profile?.heightSpacing ?? 1) * rowScale).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}`,