@volter/supercode-teams 0.2.74 → 0.2.76

package/package.json

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

@@ -4,8 +4,8 @@
 // daemon's ConPTY host on Windows, holds it); the pane ending ends the client, and the terminal closes the window as
 // its command exits. Adapters are tried in rank order; SUPERCODE_POPUP_TERMINAL names one (or `none`).
 import { spawn, spawnSync } from 'node:child_process';
-import { chmodSync, existsSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
+import { chmodSync, existsSync, readdirSync, writeFileSync } from 'node:fs';
+import { homedir, tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { weztermConfigFile } from './terminal-look.mjs';
@@ -27,11 +27,42 @@ function selfDeletingScript(argv, extension) {
   return path;
 }
 
+// Supercode's windows share one WezTerm process, as Terminal.app's windows share one app: a window opened into a
+// running process is on screen in about 0.3 s, where a process started per window took 0.7 to 2 s (measured on macOS
+// 26 with WezTerm 20240203). The process is known by its class; it listens on ~/.local/share/wezterm/gui-sock-<pid>.
+// A window goes into it with `wezterm cli spawn --new-window`, and when there is none, or the spawn fails, the window
+// starts it. The fallback runs in the launched shell, so the daemon never waits on WezTerm.
+const WEZTERM_CLASS = 'dev.volter.supercode';
+
+/** The socket of a running supercode WezTerm process, or null. */
+function weztermSocket() {
+  const dir = join(homedir(), '.local', 'share', 'wezterm');
+  let names;
+  try { names = readdirSync(dir); } catch { return null; }
+  for (const name of names) {
+    const pid = Number(/^gui-sock-(\d+)$/.exec(name)?.[1]);
+    if (!pid) continue;
+    try { process.kill(pid, 0); } catch { continue; }
+    const command = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8', timeout: 2_000 }).stdout ?? '';
+    if (command.includes(`--class ${WEZTERM_CLASS}`)) return join(dir, name);
+  }
+  return null;
+}
+
+/** WezTerm's launch: a window in supercode's running WezTerm, else a new one with supercode's look (terminal-look.mjs). */
+function weztermLaunch(program, argv) {
+  const start = [program, '--config-file', weztermConfigFile(), 'start', '--always-new-process', '--class', WEZTERM_CLASS, '--', ...argv];
+  const socket = process.platform === 'win32' ? null : weztermSocket();
+  if (!socket) return [start[0], start.slice(1)];
+  const quote = (arg) => `'${String(arg).replaceAll("'", `'"'"'`)}'`;
+  const spawnWindow = [program, 'cli', '--no-auto-start', 'spawn', '--new-window', '--', ...argv].map(quote).join(' ');
+  return ['/bin/sh', ['-c', `WEZTERM_UNIX_SOCKET=${quote(socket)} ${spawnWindow} >/dev/null 2>&1 || exec ${start.map(quote).join(' ')}`]];
+}
+
 /** Adapters by platform, in rank order: { name, find() → program or null, launch(program, argv) → [command, args] }. */
 const ADAPTERS = {
   darwin: [
-    // 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: 'wezterm', find: () => onPath('wezterm') ?? firstPath('/Applications/WezTerm.app/Contents/MacOS/wezterm'), launch: weztermLaunch },
     { 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]] },
@@ -49,7 +80,7 @@ const ADAPTERS = {
     { 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, ['--config-file', weztermConfigFile(), 'start', '--always-new-process', '--', ...argv]] },
+    { name: 'wezterm', find: () => onPath('wezterm'), launch: weztermLaunch },
     { 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-look.mjs

@@ -5,7 +5,7 @@
 // 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 { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { TERMINAL_BASIC } from './terminal-basic.mjs';
@@ -125,17 +125,25 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
     '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'",
+    // A config reload re-arms WezTerm's file watcher while it holds the lock every key and mouse event takes, and
+    // arming the watcher waits on fseventsd: open windows stopped taking input for up to 2.3 s after each popup's
+    // launch (sampled on macOS 26). The file is written for each launch, so the next process takes any change.
+    'config.automatically_reload_config = false',
     'return config',
     '',
   ];
   return lines.join('\n');
 }
 
-/** Writes the config for this machine and returns its path. */
+/** 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));
+  let current = null;
+  try { current = readFileSync(path, 'utf8'); } catch { /* not written yet */ }
+  if (current === config) return path;
   const next = `${path}.${process.pid}`;
-  writeFileSync(next, weztermConfig(terminalAppProfile(platform)));
+  writeFileSync(next, config);
   renameSync(next, path);
   return path;
 }