Fix project pill layout and tabs

Author: roodboi

.github/workflows/release-macos-app.yml

@@ -109,6 +109,87 @@ jobs:
             cp -R "$RELEASE_DIR/binaries" "$BUNDLE_DIR/binaries"
           fi
 
+      - name: Install Zig (0.15.2)
+        run: |
+          set -euo pipefail
+          ZIG_VERSION="0.15.2"
+
+          HOST_ARCH="$(uname -m)"
+          if [ "$HOST_ARCH" = "arm64" ] || [ "$HOST_ARCH" = "aarch64" ]; then
+            ZIG_ARCH="aarch64"
+          elif [ "$HOST_ARCH" = "x86_64" ] || [ "$HOST_ARCH" = "amd64" ]; then
+            ZIG_ARCH="x86_64"
+          else
+            echo "Unsupported host arch: $HOST_ARCH"
+            exit 1
+          fi
+
+          URL="https://ziglang.org/download/${ZIG_VERSION}/zig-macos-${ZIG_ARCH}-${ZIG_VERSION}.tar.xz"
+          curl -fsSL "$URL" -o "$RUNNER_TEMP/zig.tar.xz"
+          mkdir -p "$RUNNER_TEMP/zig"
+          tar -xf "$RUNNER_TEMP/zig.tar.xz" -C "$RUNNER_TEMP/zig"
+
+          ZIG_BIN="$(find "$RUNNER_TEMP/zig" -maxdepth 2 -type f -name zig | head -n 1)"
+          if [ -z "$ZIG_BIN" ]; then
+            echo "Failed to locate zig binary after extracting."
+            exit 1
+          fi
+
+          echo "$(dirname "$ZIG_BIN")" >> "$GITHUB_PATH"
+          zig version
+
+      - name: Build Ghostty VT dylib (universal)
+        run: |
+          set -euo pipefail
+
+          VENDOR_DIR="apps/macos/vendor/ghostty"
+          BRIDGE_DIR="apps/macos/Experiments/GhosttyVTBridge"
+          OUT_DIR="apps/macos/App/GhosttyVT/ghostty/lib"
+          OUT_LIB="$OUT_DIR/libhack_ghostty_vt.dylib"
+
+          if [ ! -d "$VENDOR_DIR" ]; then
+            echo "Missing vendor ghostty dir: $VENDOR_DIR"
+            exit 1
+          fi
+
+          mkdir -p "$OUT_DIR"
+
+          # Patch Ghostty's lib_vt.zig for our C ABI bridge.
+          python3 - <<'PY'
+          import pathlib
+
+          lib_vt = pathlib.Path("apps/macos/vendor/ghostty/src/lib_vt.zig")
+          text = lib_vt.read_text(encoding="utf-8")
+          guard = 'if (@import("root") == lib) {'
+          patched = 'if (@import("root") == lib and terminal.options.c_abi) {'
+          if guard in text and patched not in text:
+            text = text.replace(guard, patched)
+          if "@export(&" in text:
+            text = text.replace("@export(&", "@export(")
+          lib_vt.write_text(text, encoding="utf-8")
+          PY
+
+          mkdir -p "$RUNNER_TEMP/ghosttyvt/arm64" "$RUNNER_TEMP/ghosttyvt/x86_64"
+
+          pushd "$BRIDGE_DIR" >/dev/null
+          GHOSTTY_DIR="$GITHUB_WORKSPACE/$VENDOR_DIR"
+
+          zig build -Dghostty="$GHOSTTY_DIR" -Doptimize=ReleaseSafe -Dtarget=aarch64-macos --prefix "$RUNNER_TEMP/ghosttyvt/arm64"
+          zig build -Dghostty="$GHOSTTY_DIR" -Doptimize=ReleaseSafe -Dtarget=x86_64-macos --prefix "$RUNNER_TEMP/ghosttyvt/x86_64"
+          popd >/dev/null
+
+          ARM_LIB="$RUNNER_TEMP/ghosttyvt/arm64/lib/libhack_ghostty_vt.dylib"
+          X64_LIB="$RUNNER_TEMP/ghosttyvt/x86_64/lib/libhack_ghostty_vt.dylib"
+
+          if [ ! -f "$ARM_LIB" ] || [ ! -f "$X64_LIB" ]; then
+            echo "Missing built libs: $ARM_LIB / $X64_LIB"
+            ls -la "$RUNNER_TEMP/ghosttyvt/arm64/lib" || true
+            ls -la "$RUNNER_TEMP/ghosttyvt/x86_64/lib" || true
+            exit 1
+          fi
+
+          lipo -create "$ARM_LIB" "$X64_LIB" -output "$OUT_LIB"
+
       - name: Install xcodegen
         run: brew install xcodegen
 
@@ -185,6 +266,23 @@ jobs:
 
           codesign -vvv "$BUNDLED_HACK"
 
+      - name: Codesign Ghostty VT dylib
+        env:
+          GHOSTTY_VT: apps/macos/App/GhosttyVT/ghostty/lib/libhack_ghostty_vt.dylib
+        run: |
+          set -euo pipefail
+          if [ ! -f "$GHOSTTY_VT" ]; then
+            echo "Missing Ghostty VT dylib: $GHOSTTY_VT"
+            exit 1
+          fi
+
+          codesign --force --options runtime --timestamp \
+            --sign "$CODESIGN_IDENTITY_HASH" \
+            --keychain "$KEYCHAIN_PATH" \
+            "$GHOSTTY_VT"
+
+          codesign -vvv "$GHOSTTY_VT"
+
       - name: Build and archive
         working-directory: ${{ env.PROJECT_PATH }}
         env:

.tmp/ghosttyvt/arm64/lib/libhack_ghostty_vt.dylib

@@ -0,0 +1,6 @@
+Placeholder file.
+
+This directory is overwritten during release builds when the macOS app is populated with the
+bundled CLI assets. Keeping a real file here avoids stale Xcode project references failing local
+builds if a previously-generated project pointed at a file under `BundledCLI/assets/`.
+

.tmp/ghosttyvt/x86_64/lib/libhack_ghostty_vt.dylib

@@ -0,0 +1,9 @@
+This directory is populated during builds with `libhack_ghostty_vt.dylib`.
+
+- Release CI builds a universal dylib and stages it here before `xcodebuild archive`.
+- The app copies this folder into `Hack Desktop.app/Contents/Resources/ghostty/` during the build.
+
+If you're building locally and want the embedded terminal to work, run:
+
+`bun run macos:ghostty:bundle`
+

apps/macos/App/BundledCLI/assets/test.txt

@@ -3,6 +3,10 @@ import SwiftUI
 import DashboardFeature
 import HackCLIService
 
+#if os(macOS)
+import AppKit
+#endif
+
 #if RELEASE
 import Sparkle
 #endif
@@ -101,6 +105,13 @@ private struct DashboardCommands: Commands {
         NotificationCenter.default.post(name: .hackCommandPaletteRequested, object: nil)
       }
       .keyboardShortcut("k", modifiers: .command)
+
+      Button("Toggle Sidebar") {
+#if os(macOS)
+        NSApp.sendAction(#selector(NSSplitViewController.toggleSidebar(_:)), to: nil, from: nil)
+#endif
+      }
+      .keyboardShortcut("b", modifiers: .command)
     }
   }
 }

apps/macos/App/GhosttyVT/ghostty/lib/README.md

@@ -84,6 +84,7 @@ pub fn build(b: *std.Build) !void {
     const uucode = b.dependency("uucode", .{
         .build_config_path = std.Build.LazyPath{ .cwd_relative = uucode_config_path },
     });
+    ghostty_vt_impl.addImport("uucode", uucode.module("uucode"));
     const unicode_tables = try UnicodeTables.init(b, ghostty_path, uucode);
     unicode_tables.addModuleImport(ghostty_vt_impl);
 

apps/macos/App/GhosttyVT/ghostty/lib/libhack_ghostty_vt.dylib

@@ -55,7 +55,13 @@ export fn hack_ghostty_vt_create(cols: u32, rows: u32) ?*TerminalHandle {
     const alloc = std.heap.c_allocator;
     var handle = alloc.create(TerminalHandle) catch return null;
     handle.alloc = alloc;
-    handle.terminal = ghostty_vt.Terminal.init(alloc, .{ .cols = cols_u16, .rows = rows_u16 }) catch {
+    // Keep a generous scrollback buffer so app tabs feel like a real terminal.
+    // (Ghostty's default is 10k lines; that's too shallow for logs-heavy workflows.)
+    handle.terminal = ghostty_vt.Terminal.init(alloc, .{
+        .cols = cols_u16,
+        .rows = rows_u16,
+        .max_scrollback = 200_000,
+    }) catch {
         alloc.destroy(handle);
         return null;
     };
@@ -85,6 +91,24 @@ export fn hack_ghostty_vt_feed(handle: ?*TerminalHandle, bytes: [*]const u8, len
     _ = handle.?.stream.nextSlice(bytes[0..len]) catch {};
 }
 
+/// Scroll the viewport within the terminal scrollback buffer.
+///
+/// Positive values scroll down, negative values scroll up.
+export fn hack_ghostty_vt_scroll_viewport_delta(handle: ?*TerminalHandle, delta_rows: i32) void {
+    if (handle == null) return;
+    handle.?.terminal.scrollViewport(.{ .delta = @as(isize, delta_rows) }) catch {};
+}
+
+export fn hack_ghostty_vt_scroll_viewport_top(handle: ?*TerminalHandle) void {
+    if (handle == null) return;
+    handle.?.terminal.scrollViewport(.top) catch {};
+}
+
+export fn hack_ghostty_vt_scroll_viewport_bottom(handle: ?*TerminalHandle) void {
+    if (handle == null) return;
+    handle.?.terminal.scrollViewport(.bottom) catch {};
+}
+
 export fn hack_ghostty_vt_plain_string(handle: ?*TerminalHandle, out_len: ?*usize) ?[*]u8 {
     if (handle == null) return null;
     const str = handle.?.terminal.plainString(handle.?.alloc) catch return null;

apps/macos/App/HackDesktopApp.swift

@@ -119,8 +119,10 @@ extension View {
     if #available(macOS 26, *) {
       self
         .background(.clear)
+        // Keep the toolbar visible, but visually clear. We tune the underlying NSToolbar to avoid
+        // per-item "pill" backplates (see WindowToolbarTuner).
         .toolbarBackground(.clear, for: .windowToolbar)
-        .toolbarBackgroundVisibility(.hidden, for: .windowToolbar)
+        .toolbarBackgroundVisibility(.visible, for: .windowToolbar)
     } else {
       self
         .background(.ultraThinMaterial)