Re-run session sync after WASM init and merge Ghostty config files

- Bump a terminal epoch when the deferred WASM setup finishes so the session sync effect re-runs against the live terminal even when no session field changed during the load, completing the exited-at-mount handling - Read config.ghostty as an alternate config file name and merge the XDG and macOS Application Support configs in Ghostty's load order instead of stopping at the first existing file

Pixel Perfect committed 4 months ago

Commit 36d1cc61 parent c1caaa32 files · +24 −7Browse files

Unified · Split

2 files

apps/server/src/terminal/ghosttyStyle.ts +18 −6
apps/web/src/components/ThreadTerminalDrawer.tsx +6 −1

apps/server/src/terminal/ghosttyStyle.ts+18−6

       return undefined;
     });
-  const configSource = yield* readFirstExisting([
+  // Ghostty reads the XDG config first and the macOS Application Support
-    path.join(xdgConfigHome, "ghostty", "config"),
+  // config after it, so later files override earlier values. It also accepts
-    path.join(home, "Library", "Application Support", "com.mitchellh.ghostty", "config"),
+  // config.ghostty as the file name. Merge every location that exists instead
-  ]);
+  // of stopping at the first match.
-  if (configSource === undefined) return undefined;
+  const configDirs = [
+    path.join(xdgConfigHome, "ghostty"),
+    path.join(home, "Library", "Application Support", "com.mitchellh.ghostty"),
+  ];
+  const configSources: Array<string> = [];
+  for (const dir of configDirs) {
+    const source = yield* readFirstExisting([
+      path.join(dir, "config"),
+      path.join(dir, "config.ghostty"),
+    ]);
+    if (source !== undefined) configSources.push(source);
+  }
+  if (configSources.length === 0) return undefined;
-  const config = parseGhosttyConfig(configSource);
+  const config = parseGhosttyConfig(configSources.join("\n"));
   const loadThemeColors = (themeName: string) =>
     Effect.gen(function* () {

apps/web/src/components/ThreadTerminalDrawer.tsx+6−1

     reportFailure: false,
   });
   const hasHandledExitRef = useRef(false);
+  // Bumped when the async WASM gate finishes creating a terminal, so the
+  // session sync effect re-runs against the live terminal even when no
+  // session field changed while the WASM module was loading.
+  const [terminalEpoch, setTerminalEpoch] = useState(0);
   const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
   const selectionGestureActiveRef = useRef(false);
   const selectionActionRequestIdRef = useRef(0);
         status: "closed",
         version: 0,
       };
+      setTerminalEpoch((value) => value + 1);
       const clearSelectionAction = () => {
         selectionActionRequestIdRef.current += 1;
       });
     }
     previousSessionRef.current = current;
-  }, [autoFocus, terminalBuffer, terminalError, terminalStatus, terminalVersion]);
+  }, [autoFocus, terminalBuffer, terminalEpoch, terminalError, terminalStatus, terminalVersion]);
   useEffect(() => {
     if (!autoFocus) return;