@particle-academy/fancy-term-host 0.2.3 → 0.3.1

package/dist/index.d.cts

@@ -746,9 +746,10 @@ interface CwdHook {
  * Coverage (all overlay, never clobber the user's own prompt/rc):
  *   - **bash** — prepend an OSC-7 `printf` to `PROMPT_COMMAND` (env only). The
  *     portable, reliable case (Git Bash on Windows, bash on POSIX).
- *   - **zsh** — point `ZDOTDIR` at a generated dir whose `.zshrc` sources the
- *     user's real `.zshrc`, restores `ZDOTDIR`, then registers a `precmd`
- *     emitter; `.zshenv` sources the user's real `.zshenv` first.
+ *   - **zsh** — point `ZDOTDIR` at a generated dir that overlays the FULL login
+ *     startup chain (`.zshenv` → `.zprofile` → `.zshrc`), each sourcing the
+ *     user's real counterpart, restores `ZDOTDIR` in `.zshrc` (so `~/.zlogin`
+ *     loads from the real dir), then registers a `precmd` emitter.
  *   - **fish** — prepend a generated dir to `XDG_DATA_DIRS` carrying a
  *     `fish/vendor_conf.d/osc7.fish` that hooks `--on-event fish_prompt`
  *     (vendor conf overlays the user's config rather than replacing it).

package/dist/index.d.ts

@@ -746,9 +746,10 @@ interface CwdHook {
  * Coverage (all overlay, never clobber the user's own prompt/rc):
  *   - **bash** — prepend an OSC-7 `printf` to `PROMPT_COMMAND` (env only). The
  *     portable, reliable case (Git Bash on Windows, bash on POSIX).
- *   - **zsh** — point `ZDOTDIR` at a generated dir whose `.zshrc` sources the
- *     user's real `.zshrc`, restores `ZDOTDIR`, then registers a `precmd`
- *     emitter; `.zshenv` sources the user's real `.zshenv` first.
+ *   - **zsh** — point `ZDOTDIR` at a generated dir that overlays the FULL login
+ *     startup chain (`.zshenv` → `.zprofile` → `.zshrc`), each sourcing the
+ *     user's real counterpart, restores `ZDOTDIR` in `.zshrc` (so `~/.zlogin`
+ *     loads from the real dir), then registers a `precmd` emitter.
  *   - **fish** — prepend a generated dir to `XDG_DATA_DIRS` carrying a
  *     `fish/vendor_conf.d/osc7.fish` that hooks `--on-event fish_prompt`
  *     (vendor conf overlays the user's config rather than replacing it).

package/dist/index.js

@@ -1,14 +1,15 @@
 import { resolveSpawnCwd, toNativeCwd } from './chunk-V3MW5UTX.js';
 export { resolveSpawnCwd, toNativeCwd } from './chunk-V3MW5UTX.js';
-export { ptyHostScriptPath } from './chunk-DB3SIE53.js';
-import { FrameDecoder, PROTOCOL_VERSION, encodeFrame, readPidfile, pidfileUsable, deletePidfile } from './chunk-7NXYRMNA.js';
-export { FrameDecoder, PROTOCOL_VERSION, deletePidfile, encodeFrame, isPidAlive, pidfilePath, pidfileUsable, readPidfile, resolveHostScript, socketPathFor, userHash, writePidfile } from './chunk-7NXYRMNA.js';
+export { ptyHostScriptPath } from './chunk-Q4WC2TIE.js';
+import { FrameDecoder, PROTOCOL_VERSION, encodeFrame, readPidfile, pidfileUsable, deletePidfile, isPidAlive, terminateHost, awaitPidGone } from './chunk-2A4TFTNQ.js';
+export { FrameDecoder, PROTOCOL_VERSION, deletePidfile, encodeFrame, isPidAlive, pidfilePath, pidfileUsable, readPidfile, resolveHostScript, socketPathFor, userHash, writePidfile } from './chunk-2A4TFTNQ.js';
 import { spawn } from 'node-pty';
 import { EventEmitter } from 'events';
 import fs2 from 'fs';
 import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
+import { execFileSync } from 'child_process';
 import zlib from 'zlib';
 import net from 'net';
 
@@ -127,6 +128,27 @@ function unixCandidates() {
     }
   ];
 }
+function parseDsclUserShell(output) {
+  const m = /UserShell:\s*(\S+)/.exec(output);
+  return m ? m[1] : null;
+}
+function macUserShell() {
+  try {
+    const user = os.userInfo().username;
+    const out = execFileSync("dscl", [".", "-read", `/Users/${user}`, "UserShell"], {
+      encoding: "utf8",
+      timeout: 2e3
+    });
+    return parseDsclUserShell(out);
+  } catch {
+    return null;
+  }
+}
+function resolveLoginShell(env = process.env, platform = process.platform, macLookup = macUserShell) {
+  if (env.SHELL) return env.SHELL;
+  if (platform === "darwin") return macLookup();
+  return null;
+}
 function detectShells() {
   const candidates = process.platform === "win32" ? windowsCandidates() : unixCandidates();
   const found = [];
@@ -135,14 +157,18 @@ function detectShells() {
     if (command) found.push({ id: c.id, label: c.label, command, args: c.args });
   }
   if (process.platform !== "win32") {
-    const login = process.env.SHELL;
-    if (login && !found.some((s) => s.command === login) && fs2.existsSync(login)) {
-      found.unshift({
+    const login = resolveLoginShell();
+    if (login && fs2.existsSync(login)) {
+      const existing = found.find((s) => s.command === login);
+      const rest = found.filter((s) => s.command !== login);
+      const head = existing ?? {
         id: path.basename(login),
         label: path.basename(login),
         command: login,
         args: ["-l"]
-      });
+      };
+      found.length = 0;
+      found.push(head, ...rest);
     }
   }
   return found;
@@ -204,6 +230,12 @@ function cwdHookSpawn(command, settings) {
       path.join(dir, ".zshenv"),
       `# fancy-term-host (generated)
 [ -f "${orig}/.zshenv" ] && source "${orig}/.zshenv"
+`
+    );
+    const okProfile = writeShim(
+      path.join(dir, ".zprofile"),
+      `# fancy-term-host (generated)
+[ -f "${orig}/.zprofile" ] && source "${orig}/.zprofile"
 `
     );
     const okRc = writeShim(
@@ -216,7 +248,7 @@ typeset -ga precmd_functions
 precmd_functions+=(__fth_osc7)
 `
     );
-    return okEnv && okRc ? { env: { ZDOTDIR: dir }, args: [] } : empty;
+    return okEnv && okProfile && okRc ? { env: { ZDOTDIR: dir }, args: [] } : empty;
   }
   if (kind === "fish") {
     const dir = hookDir();
@@ -992,6 +1024,35 @@ async function awaitUsableHost(userData, timeoutMs = 4e3) {
   }
   return false;
 }
+async function reapHost(userData, pf) {
+  if (pf && isPidAlive(pf.pid) && terminateHost(pf.pid)) {
+    await awaitPidGone(pf.pid, 2e3);
+  }
+  deletePidfile(userData);
+}
+async function connectOrSpawnHost(userData, spawner, snapshots) {
+  let pf = readPidfile(userData);
+  if (pidfileUsable(pf)) {
+    try {
+      return await HostClient.connect(pf.socketPath, snapshots);
+    } catch {
+      await reapHost(userData, pf);
+      pf = null;
+    }
+  } else if (pf) {
+    await reapHost(userData, pf);
+    pf = null;
+  }
+  deletePidfile(userData);
+  const hostScript = spawner.resolveHostScript();
+  if (!hostScript) return null;
+  spawner.spawnDetached(hostScript, { GENIE_USERDATA: userData });
+  const up = await awaitUsableHost(userData);
+  if (!up) return null;
+  pf = readPidfile(userData);
+  if (!pf) return null;
+  return await HostClient.connect(pf.socketPath, snapshots);
+}
 async function initTerminalBackend() {
   setActiveBackend(inProcessBackend());
   if (!deps || !detachedEnabled()) {
@@ -1000,33 +1061,17 @@ async function initTerminalBackend() {
   const { spawner, snapshots } = deps;
   const userData = spawner.userDataDir();
   try {
-    const hostScript = spawner.resolveHostScript();
-    let pf = readPidfile(userData);
-    if (!pidfileUsable(pf)) {
-      deletePidfile(userData);
-      if (!hostScript) {
-        status(
-          "Detached terminals unavailable (host not found) \u2014 using in-process. Sessions won't survive a full quit."
-        );
-        return { host: false, reattachIds: [] };
-      }
-      spawner.spawnDetached(hostScript, { GENIE_USERDATA: userData });
-      const up = await awaitUsableHost(userData);
-      if (!up) {
-        status(
-          "Detached terminals unavailable (host didn't start) \u2014 using in-process. Sessions won't survive a full quit."
-        );
-        return { host: false, reattachIds: [] };
-      }
-      pf = readPidfile(userData);
-    }
-    if (!pf) {
+    const c = await connectOrSpawnHost(userData, spawner, snapshots);
+    if (!c) {
+      client = null;
+      usingHost = false;
+      setActiveBackend(inProcessBackend());
       status(
         "Detached terminals unavailable \u2014 using in-process. Sessions won't survive a full quit."
       );
       return { host: false, reattachIds: [] };
     }
-    client = await HostClient.connect(pf.socketPath, snapshots);
+    client = c;
     client.on("error", onHostError);
     setActiveBackend(client);
     usingHost = true;