@volter/supercode-teams 0.2.87 → 0.2.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.87",
+  "version": "0.2.89",
   "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,10 +4,10 @@
 // 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, readFileSync, readdirSync, writeFileSync } from 'node:fs';
-import { homedir, tmpdir } from 'node:os';
+import { chmodSync, existsSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { createHash, randomBytes } from 'node:crypto';
+import { randomBytes } from 'node:crypto';
 import { weztermConfigFile } from './terminal-look.mjs';
 
 const onPath = (name) => {
@@ -27,39 +27,13 @@ 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. The class carries the
-// config's content: WezTerm does not reload it (terminal-look.mjs), so a process holding an older look is never reused.
-const WEZTERM_CLASS = 'dev.volter.supercode';
-
-/** The socket of a running supercode WezTerm process of class `cls`, or null. */
-function weztermSocket(cls) {
-  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 ${cls} `)) 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). */
+// Each window is a WezTerm process of its own, with supercode's look (terminal-look.mjs). Windows sharing one process
+// share its one main thread: on the owner's Mac, four Claude sessions' output kept that thread painting for whole
+// seconds at a time (97-98% of 3 s samples), and a drag in any other popup went unanswered meanwhile. A process of its
+// own opens in 0.7 to 2 s where a window in a running process opened in about 0.3 s; it is never frozen by another
+// window's output.
 function weztermLaunch(program, argv) {
-  const config = weztermConfigFile();
-  const cls = `${WEZTERM_CLASS}.${createHash('sha256').update(readFileSync(config)).digest('hex').slice(0, 12)}`;
-  const start = [program, '--config-file', config, 'start', '--always-new-process', '--class', cls, '--', ...argv];
-  const socket = process.platform === 'win32' ? null : weztermSocket(cls);
-  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(' ')}`]];
+  return [program, ['--config-file', weztermConfigFile(), 'start', '--always-new-process', '--', ...argv]];
 }
 
 /** Adapters by platform, in rank order: { name, find() → program or null, launch(program, argv) → [command, args] }. */

package/terminal-look.mjs

@@ -165,6 +165,18 @@ export function weztermConfig(profile, { fontDirs = existsSync(TERMINAL_FONTS) ?
     'end',
     "wezterm.on('window-config-reloaded', fit)",
     "wezterm.on('window-resized', fit)",
+    // Terminal.app's title: the working directory's name, the running process, the size ("yueranyuan — sleep 40 — 81×18").
+    "wezterm.on('format-window-title', function(tab, pane)",
+    "  local ok, title = pcall(function()",
+    "    local cwd = pane.current_working_dir",
+    "    cwd = cwd and (type(cwd) == 'userdata' and cwd.file_path or tostring(cwd)) or ''",
+    "    local folder = cwd:gsub('/+$', ''):match('[^/]+$') or ''",
+    "    local process = (pane.foreground_process_name or ''):match('[^/]+$') or pane.title",
+    "    local dims = wezterm.mux.get_pane(pane.pane_id):get_dimensions()",
+    "    return string.format('%s — %s — %d×%d', folder, process, dims.cols, dims.viewport_rows)",
+    "  end)",
+    "  return ok and title or pane.title",
+    "end)",
     `config.font_dirs = { ${fontDirs.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.