fix(terminal): polish pass — node-pty diagnostics, Ctrl+W guards, black flash, split grouping

apps/desktop/src/window/DesktopWindow.ts

@@ -514,6 +514,19 @@ export const make = Effect.gen(function* () {
       }
     });
 
+    // Electron's windowMenu close role owns CmdOrCtrl+W. Holding the
+    // close-terminal shortcut auto-repeats faster than the renderer can re-arm
+    // its guard after the last terminal closes, and a single leaked repeat
+    // closes the whole window (and on Windows/Linux, the app). Only deliberate,
+    // non-repeated presses may act.
+    window.webContents.on("before-input-event", (event, input) => {
+      if (input.type !== "keyDown" || !input.isAutoRepeat) return;
+      const modifier = environment.platform === "darwin" ? input.meta : input.control;
+      if (modifier && !input.alt && !input.shift && input.key.toLowerCase() === "w") {
+        event.preventDefault();
+      }
+    });
+
     window.on("page-title-updated", (event) => {
       event.preventDefault();
       window.setTitle(environment.displayName);

apps/server/src/cli/server.ts

@@ -5,6 +5,25 @@ import { ServerConfig, type StartupPresentation } from "../config.ts";
 import { runServer } from "../server.ts";
 import { type CliServerFlags, resolveServerConfig, sharedServerCommandFlags } from "./config.ts";
 
+/**
+ * Defects thrown while building the server layer can be swallowed by headless
+ * startup logging, which used to make `npx t3` exit cleanly with no output on a
+ * broken install. The entrypoint owns process-exit policy, so render whatever
+ * diagnosis the defect carries and make sure the exit code is non-zero.
+ */
+const hasDiagnostic = (defect: unknown): defect is { readonly diagnostic: string } =>
+  typeof defect === "object" &&
+  defect !== null &&
+  typeof (defect as { diagnostic?: unknown }).diagnostic === "string";
+
+const reportStartupDefect = (defect: unknown) =>
+  Effect.sync(() => {
+    process.exitCode = 1;
+    if (hasDiagnostic(defect)) {
+      process.stderr.write(`${defect.diagnostic}\n`);
+    }
+  });
+
 export const runServerCommand = (
   flags: CliServerFlags,
   options?: {
@@ -15,7 +34,10 @@ export const runServerCommand = (
   Effect.gen(function* () {
     const logLevel = yield* GlobalFlag.LogLevel;
     const config = yield* resolveServerConfig(flags, logLevel, options);
-    return yield* runServer.pipe(Effect.provideService(ServerConfig, config));
+    return yield* runServer.pipe(
+      Effect.provideService(ServerConfig, config),
+      Effect.tapDefect(reportStartupDefect),
+    );
   });
 
 export const startCommand = Command.make("start", { ...sharedServerCommandFlags }).pipe(

apps/server/src/terminal/Manager.test.ts

@@ -541,6 +541,33 @@ it.layer(
     }),
   );
 
+  it.effect("orders the resize reply behind output queued at the old width", () =>
+    Effect.gen(function* () {
+      const { manager, ptyAdapter, getEvents } = yield* createManager();
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0];
+      expect(process).toBeDefined();
+      if (!process) return;
+
+      // Queued but not yet drained: produced at the pre-resize width.
+      process.emitData("old-width bytes\n");
+
+      yield* manager.resize({
+        threadId: "thread-1",
+        terminalId: DEFAULT_TERMINAL_ID,
+        cols: 42,
+        rows: 20,
+      });
+
+      // By the time the resize reply lands, the old-width output must already
+      // be published — the client applies its grid on this reply.
+      const events = yield* getEvents;
+      const outputEvent = events.find((event) => event.type === "output");
+      expect(outputEvent).toBeDefined();
+      expect(process.resizeCalls).toEqual([{ cols: 42, rows: 20 }]);
+    }),
+  );
+
   it.effect("preserves structured context and causes for PTY I/O failures", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager();
@@ -991,6 +1018,34 @@ it.layer(
     }),
   );
 
+  it.effect("strips mode, version, and DCS query traffic that reopening would replay", () =>
+    Effect.gen(function* () {
+      const { manager, ptyAdapter } = yield* createManager();
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0];
+      expect(process).toBeDefined();
+      if (!process) return;
+
+      // The families behind the reopen gibberish from the field reports:
+      // DECRQM query + DECRPM replies, DECRQSS/XTGETTCAP query + reply, and
+      // XTVERSION/kitty-keyboard queries.
+      process.emitData("prompt ");
+      process.emitData("\u001b[?2026$p\u001b[?2026;2$y\u001b[?2027;0$y");
+      process.emitData("\u001bP$q m\u001b\\\u001bP1$r0m\u001b\\");
+      process.emitData("\u001bP+q544e\u001b\\\u001bP1+r544e=1b\u001b\\");
+      process.emitData("\u001b[>q\u001b[?u\u001b[?31u");
+      // Setters that share final bytes with the stripped queries must survive:
+      // DECSCUSR (cursor style) and restore-cursor.
+      process.emitData("\u001b[4 q\u001b[umid ");
+      process.emitData("done\n");
+
+      yield* manager.close({ threadId: "thread-1" });
+
+      const reopened = yield* manager.open(openInput());
+      assert.equal(reopened.history, "prompt \u001b[4 q\u001b[umid done\n");
+    }),
+  );
+
   it.effect(
     "preserves clear and style control sequences while dropping chunk-split query traffic",
     () =>
@@ -1260,6 +1315,29 @@ it.layer(
     }),
   );
 
+  it.effect("does not retry other shells when spawn-helper is not executable", () =>
+    Effect.gen(function* () {
+      const { manager, ptyAdapter, getEvents } = yield* createManager();
+      ptyAdapter.spawnFailures.push(
+        new PtyAdapter.SpawnHelperNotExecutableError({
+          helperPath: "/pkg/spawn-helper",
+          cause: new Error("posix_spawnp failed."),
+        }),
+      );
+
+      const snapshot = yield* manager.open(openInput());
+
+      assert.equal(snapshot.status, "error");
+      expect(ptyAdapter.spawnInputs).toHaveLength(1);
+
+      // The user must see the fix, not the generic "tried these shells" wrapper.
+      const events = yield* getEvents;
+      const errorEvent = events.find((event) => event.type === "error");
+      assert.isDefined(errorEvent);
+      assert.include(errorEvent?.message ?? "", 'chmod +x "/pkg/spawn-helper"');
+    }),
+  );
+
   it.effect("prefers PowerShell over ComSpec for Windows terminals", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager(5, {