@volter/supercode-teams 0.2.68 → 0.2.70

package/machine.mjs

@@ -813,7 +813,11 @@ export class TeamsMachine extends MachineCore {
     if (!terminal) return;
     const attach = process.platform === 'win32'
       ? [process.execPath, fileURLToPath(new URL('./bin/fleet.mjs', import.meta.url)), 'attach', contextKey, '--mode', 'control']
-      : [spawnSync('which', ['tmux'], { encoding: 'utf8' }).stdout.trim() || 'tmux', ...(this.tmuxSocket ? ['-L', this.tmuxSocket] : []), 'attach-session', '-t', session.label ?? contextKey];
+      // Presented as `supercode open`'s own client is (crates/cli/src/open.rs `attach`): the terminal sets its own
+      // TERM (WezTerm's is xterm-256color), and only a screen-256color client gets the pane server's no-alternate-
+      // screen override, so the window's own scrollback, wheel and selection work instead of the wheel arriving
+      // in the pane as up/down arrows.
+      : ['/usr/bin/env', 'TERM=screen-256color', spawnSync('which', ['tmux'], { encoding: 'utf8' }).stdout.trim() || 'tmux', ...(this.tmuxSocket ? ['-L', this.tmuxSocket] : []), '-T', 'RGB', 'attach-session', '-t', session.label ?? contextKey];
     openPopup(terminal, attach, { ...this.env, TMUX: '' });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.68",
+  "version": "0.2.70",
   "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/popup-terminals.mjs

@@ -8,6 +8,7 @@ import { chmodSync, existsSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
+import { weztermConfigFile } from './terminal-look.mjs';
 
 const onPath = (name) => {
   const found = spawnSync(process.platform === 'win32' ? 'where' : 'which', [name], { encoding: 'utf8', timeout: 3_000 });
@@ -29,7 +30,8 @@ function selfDeletingScript(argv, extension) {
 /** Adapters by platform, in rank order: { name, find() → program or null, launch(program, argv) → [command, args] }. */
 const ADAPTERS = {
   darwin: [
-    { name: 'wezterm', find: () => onPath('wezterm') ?? firstPath('/Applications/WezTerm.app/Contents/MacOS/wezterm'), launch: (p, argv) => [p, ['start', '--always-new-process', '--', ...argv]] },
+    // WezTerm opens with supercode's own config: it looks like this machine's Terminal.app (terminal-look.mjs).
+    { name: 'wezterm', find: () => onPath('wezterm') ?? firstPath('/Applications/WezTerm.app/Contents/MacOS/wezterm'), launch: (p, argv) => [p, ['--config-file', weztermConfigFile(), 'start', '--always-new-process', '--', ...argv]] },
     { name: 'kitty', find: () => onPath('kitty') ?? firstPath('/Applications/kitty.app/Contents/MacOS/kitty'), launch: (p, argv) => [p, argv] },
     { name: 'ghostty', find: () => firstPath('/Applications/Ghostty.app'), launch: (p, argv) => ['open', ['-na', p, '--args', '-e', ...argv]] },
     { name: 'alacritty', find: () => onPath('alacritty') ?? firstPath('/Applications/Alacritty.app/Contents/MacOS/alacritty'), launch: (p, argv) => [p, ['-e', ...argv]] },
@@ -41,13 +43,13 @@ const ADAPTERS = {
     // Windows Terminal first: its window opens in front of the others, where one started by a background process
     // (the daemon is one) opens behind them; WezTerm started that way never painted its window (volter-desktop).
     { name: 'windows-terminal', find: () => onPath('wt') ?? firstPath(join(localApps, 'Microsoft', 'WindowsApps', 'wt.exe')), launch: (p, argv) => [p, ['-w', 'new', 'new-tab', '--', ...argv]] },
-    { name: 'wezterm', find: () => onPath('wezterm') ?? firstPath(join(programFiles, 'WezTerm', 'wezterm.exe')), launch: (p, argv) => [p, ['start', '--always-new-process', '--', ...argv]] },
+    { name: 'wezterm', find: () => onPath('wezterm') ?? firstPath(join(programFiles, 'WezTerm', 'wezterm.exe')), launch: (p, argv) => [p, ['--config-file', weztermConfigFile(), 'start', '--always-new-process', '--', ...argv]] },
     { name: 'alacritty', find: () => onPath('alacritty') ?? firstPath(join(programFiles, 'Alacritty', 'alacritty.exe')), launch: (p, argv) => [p, ['-e', ...argv]] },
     // A console window of its own, on every Windows: it lives exactly as long as its command.
     { name: 'conhost', find: () => firstPath(join(process.env.SystemRoot ?? 'C:\\Windows', 'System32', 'conhost.exe')), launch: (p, argv) => [p, argv] },
   ],
   linux: [
-    { name: 'wezterm', find: () => onPath('wezterm'), launch: (p, argv) => [p, ['start', '--always-new-process', '--', ...argv]] },
+    { name: 'wezterm', find: () => onPath('wezterm'), launch: (p, argv) => [p, ['--config-file', weztermConfigFile(), 'start', '--always-new-process', '--', ...argv]] },
     { name: 'kitty', find: () => onPath('kitty'), launch: (p, argv) => [p, argv] },
     { name: 'ghostty', find: () => onPath('ghostty'), launch: (p, argv) => [p, ['-e', ...argv]] },
     { name: 'alacritty', find: () => onPath('alacritty'), launch: (p, argv) => [p, ['-e', ...argv]] },

package/terminal-basic.mjs

@@ -0,0 +1,49 @@
+// Generated by sdk/teams/scripts/terminal-basic.mjs from https://brand.volter.ai/tokens.json
+// (the brand's terminal roles: Terminal.app's Basic profile). Do not edit; re-run the script after a brand change.
+export const TERMINAL_BASIC = {
+  "light": {
+    "background": "#ffffff",
+    "foreground": "#000000",
+    "cursor": "#9d9d9d",
+    "selection": "#b3d7ff",
+    "black": "#000000",
+    "red": "#990000",
+    "green": "#00a600",
+    "yellow": "#999900",
+    "blue": "#0000b3",
+    "magenta": "#b300b3",
+    "cyan": "#00a6b3",
+    "white": "#bfbfbf",
+    "brightBlack": "#666666",
+    "brightRed": "#e60000",
+    "brightGreen": "#00d900",
+    "brightYellow": "#e6e600",
+    "brightBlue": "#0000ff",
+    "brightMagenta": "#e600e6",
+    "brightCyan": "#00e6e6",
+    "brightWhite": "#e6e6e6"
+  },
+  "dark": {
+    "background": "#1e1e1e",
+    "foreground": "#ffffff",
+    "cursor": "#9d9d9d",
+    "selection": "#3f638b",
+    "black": "#000000",
+    "red": "#990000",
+    "green": "#00a600",
+    "yellow": "#999900",
+    "blue": "#0000b3",
+    "magenta": "#b300b3",
+    "cyan": "#00a6b3",
+    "white": "#bfbfbf",
+    "brightBlack": "#666666",
+    "brightRed": "#e60000",
+    "brightGreen": "#00d900",
+    "brightYellow": "#e6e600",
+    "brightBlue": "#0000ff",
+    "brightMagenta": "#e600e6",
+    "brightCyan": "#00e6e6",
+    "brightWhite": "#e6e6e6"
+  },
+  "fontSize": 11
+};

package/terminal-look.mjs

@@ -0,0 +1,128 @@
+// The look of a WezTerm window supercode opens: Apple's Terminal.app, so a person from macOS feels at home (the
+// owner's ruling). On a Mac the window takes this machine's own Terminal.app default profile: its colours, face, size,
+// spacing, cursor, Option key, bell, opacity, blur and window size, read from com.apple.Terminal and converted to sRGB
+// by AppKit itself. Whatever the profile leaves unset, and every slot on a machine without Terminal.app, is Terminal.app's
+// Basic profile (terminal-basic.mjs, the brand's terminal roles), light or dark with the system's appearance as Basic is.
+// The config is WezTerm's own file, passed with `--config-file`; the person's ~/.wezterm.lua is not read for it.
+import { execFileSync } from 'node:child_process';
+import { existsSync, renameSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { TERMINAL_BASIC } from './terminal-basic.mjs';
+
+const TERMINAL_FONTS = '/System/Applications/Utilities/Terminal.app/Contents/Resources/Fonts';
+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
+// permission is asked for. Terminal.app's own faces (SF Mono Terminal) are registered first, for the process only, so
+// the profile's archived font resolves to its family.
+const READ_PROFILE = `
+ObjC.import('AppKit'); ObjC.import('CoreText');
+function run() {
+  const defaults = $.NSUserDefaults.alloc.initWithSuiteName('com.apple.Terminal');
+  const name = ObjC.unwrap(defaults.stringForKey('Default Window Settings'));
+  const profiles = defaults.dictionaryForKey('Window Settings');
+  if (!name || profiles.isNil()) return 'null';
+  const profile = profiles.objectForKey(name);
+  if (profile.isNil()) return JSON.stringify({ name });
+  const dir = ${JSON.stringify(TERMINAL_FONTS)};
+  const files = $.NSFileManager.defaultManager.contentsOfDirectoryAtPathError(dir, null);
+  if (!files.isNil()) for (const file of ObjC.deepUnwrap(files)) $.CTFontManagerRegisterFontsForURL($.NSURL.fileURLWithPath(dir + '/' + file), 1, null);
+  const value = (key) => { const item = profile.objectForKey(key); return item.isNil() ? undefined : ObjC.deepUnwrap(item); };
+  const archived = (key) => { const data = profile.objectForKey(key); return data.isNil() ? null : $.NSKeyedUnarchiver.unarchiveObjectWithData(data); };
+  const colors = {};
+  for (const key of ObjC.deepUnwrap(profile.allKeys)) {
+    if (!/Color$/.test(key)) continue;
+    const color = archived(key);
+    const srgb = color && !color.isNil() ? color.colorUsingColorSpace($.NSColorSpace.sRGBColorSpace) : null;
+    if (srgb && !srgb.isNil()) colors[key] = [srgb.redComponent, srgb.greenComponent, srgb.blueComponent, srgb.alphaComponent];
+  }
+  const font = archived('Font');
+  return JSON.stringify({
+    name, colors,
+    font: font && !font.isNil() ? { family: ObjC.unwrap(font.familyName), size: font.pointSize } : 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'),
+    blur: value('BackgroundBlur'), columns: value('columnCount'), rows: value('rowCount'),
+  });
+}`;
+
+/** 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;
+  try {
+    return JSON.parse(execFileSync('osascript', ['-l', 'JavaScript', '-e', READ_PROFILE], { encoding: 'utf8', timeout: 5_000, stdio: ['ignore', 'pipe', 'ignore'] }));
+  } catch {
+    return null;
+  }
+}
+
+const hex = ([r, g, b]) => `#${[r, g, b].map((part) => Math.round(Math.min(1, Math.max(0, part)) * 255).toString(16).padStart(2, '0')).join('')}`;
+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] : [] } = {}) {
+  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) => {
+    const pick = (key, slot) => (stored[key] ? hex(stored[key]) : basic[slot]);
+    const background = pick('BackgroundColor', 'background');
+    const foreground = pick('TextColor', 'foreground');
+    const cursor = pick('CursorColor', 'cursor');
+    return {
+      background, foreground,
+      cursor_bg: cursor, cursor_border: cursor, cursor_fg: background,
+      selection_bg: pick('SelectionColor', 'selection'), selection_fg: foreground,
+      ansi: ANSI.map((name) => pick(`ANSI${name}Color`, name.toLowerCase())),
+      brights: ANSI.map((name) => pick(`ANSIBright${name}Color`, `bright${name}`)),
+    };
+  };
+  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 opacity = stored.BackgroundColor?.[3] ?? 1;
+  const cursorShape = ['Block', 'Underline', 'Bar'][profile?.cursorType ?? 0] ?? 'Block';
+  const composed = !profile?.optionIsMeta;
+  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 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(', ')} })`,
+    `config.font_size = ${profile?.font?.size ?? TERMINAL_BASIC.fontSize}`,
+    `config.cell_width = ${profile?.widthSpacing ?? 1}`,
+    `config.line_height = ${profile?.heightSpacing ?? 1}`,
+    `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}`,
+    `config.audible_bell = ${lua(profile?.bell === false ? 'Disabled' : 'SystemBeep')}`,
+    ...(profile?.visualBell ? ["config.visual_bell = { fade_in_duration_ms = 75, fade_out_duration_ms = 75, target = 'BackgroundColor' }"] : []),
+    ...(typeof profile?.brightBold === 'boolean' ? [`config.bold_brightens_ansi_colors = ${profile.brightBold}`] : []),
+    `config.window_background_opacity = ${opacity}`,
+    // Terminal.app's blur is 0 to 1; WezTerm's is a radius. 40 at full blur is an estimate, not a measurement.
+    `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 }',
+    '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).
+    "config.window_close_confirmation = 'NeverPrompt'",
+    'return config',
+    '',
+  ];
+  return lines.join('\n');
+}
+
+/** Writes the config for this machine and returns its path. */
+export function weztermConfigFile(platform = process.platform) {
+  const path = join(tmpdir(), `supercode-wezterm-${process.getuid?.() ?? 'user'}.lua`);
+  const next = `${path}.${process.pid}`;
+  writeFileSync(next, weztermConfig(terminalAppProfile(platform)));
+  renameSync(next, path);
+  return path;
+}