hop2 0.11.0 → 0.11.2

package/hay/apps/server/src/pty.ts

@@ -8,6 +8,14 @@ export type PtyFactoryOptions = {
   cwd: string;
   env?: Record<string, string>;
   shell?: string;
+  // Launch the session ON this command instead of typing it into a shell
+  // afterwards. Restore used to attach, wait a fixed delay, and type the
+  // relaunch — which silently lost the keystrokes whenever the shell wasn't
+  // at its prompt yet. Passing the command as argv removes the whole class:
+  // there is no prompt to race, nothing to half-type, and no command echo in
+  // the scrollback. The shell is re-exec'd afterwards so the session behaves
+  // exactly as before once the command exits.
+  command?: string;
 };
 
 export type PtyFactory = (options: PtyFactoryOptions) => IPty;
@@ -25,7 +33,7 @@ const resolveShell = (shellOverride?: string) => {
   return "/bin/bash";
 };
 
-export const createPty: PtyFactory = ({ cols, rows, cwd, env: envOverrides, shell }) => {
+export const createPty: PtyFactory = ({ cols, rows, cwd, env: envOverrides, shell, command }) => {
   const mode = process.env.PTY_MODE ?? "native";
   if (mode === "mock") {
     return createMockPty();
@@ -37,6 +45,12 @@ export const createPty: PtyFactory = ({ cols, rows, cwd, env: envOverrides, shel
         env[key] = value;
       }
     }
+    // Shared PTYs get resized whenever a differently-sized device attaches
+    // (autofit claims), and every resize makes zsh re-emit its end-of-line
+    // mark ("%" + a line of spaces + CR) into history at the OLD width —
+    // rendering as stray reverse-video % at line ends for every later viewer.
+    // Suppress the mark for hop-spawned shells; user env overrides still win.
+    env.PROMPT_EOL_MARK = "";
     if (envOverrides && typeof envOverrides === "object") {
       for (const [key, value] of Object.entries(envOverrides)) {
         if (!key || typeof value !== "string") continue;
@@ -47,7 +61,27 @@ export const createPty: PtyFactory = ({ cols, rows, cwd, env: envOverrides, shel
     if (!env.COLORTERM) {
       env.COLORTERM = "truecolor";
     }
-    return pty.spawn(resolveShell(shell), [], {
+    // A hop session is an INTERACTIVE terminal, so it must never inherit a
+    // "this output isn't for a human" color suppressor from whatever
+    // launched the daemon. Claude Code sets NO_COLOR=1 for the shells it
+    // runs commands in — so a daemon (re)started from inside an agent
+    // session propagated NO_COLOR into every PTY it spawned afterwards, and
+    // every app in every session silently went monochrome: measured, claude
+    // emits ZERO colored SGR with NO_COLOR=1 and full 24-bit truecolor
+    // without it. That is the whole "claude has no color in hop but does in
+    // iTerm" report. Explicit per-session env overrides above still win.
+    if (!envOverrides || !("NO_COLOR" in envOverrides)) delete env.NO_COLOR;
+    if (env.FORCE_COLOR === "0" && (!envOverrides || !("FORCE_COLOR" in envOverrides))) {
+      delete env.FORCE_COLOR;
+    }
+    const shellPath = resolveShell(shell);
+    // `-lc` runs the command in a login shell (rc files, aliases, PATH all
+    // as the user has them), then `exec <shell> -l` replaces it with the
+    // normal interactive shell, so exiting the app leaves a usable session.
+    const args = command
+      ? ["-lc", `${command}; exec ${shellPath} -l`]
+      : [];
+    return pty.spawn(shellPath, args, {
       cols,
       rows,
       cwd,