A file lock waits out Windows removing the previous holder's lock; the site's header fits one row on a phone, the tools page draws its claims, and the README opens on the wordmark

- On Windows a lock directory being removed answers access denied, not already exists, so a
  second writer, such as two MCP servers signing in at once, failed instead of waiting.
- The header is Docs, Tools and the GitHub mark, one row down to 320px; /themes folds into the
  homepage's gallery and redirects there.
- The tools page has a terminal of measured rows beside its intro and a chart of whole-task cost
  against Luxe's 1x beside its table; Pi leaves the comparison.
- The README opens on a generated wordmark banner that carries its own colors.
This commit is contained in:
Evan Whittaker
2026-10-17 16:58:08 -05:00
parent 846a413a4d
commit 3c69a90b06
15 changed files with 534 additions and 420 deletions

View File

@@ -1,4 +1,4 @@
# Luxe
<h1 align="center"><img src="web/src/assets/generated/wordmark-banner.svg" alt="Luxe" width="420"></h1>
Luxe is a coding agent for your terminal, written in Rust. It works in your project with the model
you choose, then reads back what it changed as a Guided Review, so you can comment, ask for fixes,

View File

@@ -168,8 +168,8 @@ community favorites and of Omarchy's themes:
{ "theme": "nord" }
```
An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all at
[luxe.dev/themes](https://luxe.dev/themes).
An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all on
[luxe.dev](https://luxe.dev/#craft).
Code is colored by the theme too: in answers, tool cards, diffs and the preview, keywords take the
theme's `accentSecondary`, strings its `success`, numbers its `warning`, functions its `accent`,

View File

@@ -227,27 +227,49 @@ impl FileLock {
let path = target.with_extension("lock");
let deadline = SystemTime::now() + LOCK_TIMEOUT;
loop {
match std::fs::create_dir(&path) {
let error = match std::fs::create_dir(&path) {
Ok(()) => return Ok(Self { path }),
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
if lock_is_stale(&path) {
tracing::warn!(lock = %path.display(), "breaking a stale config lock");
let _ = std::fs::remove_dir(&path);
continue;
}
if SystemTime::now() >= deadline {
return Err(FileError::LockTimeout(path));
}
std::thread::sleep(Duration::from_millis(25));
}
Err(error) => {
return Err(FileError::io(format!("locking {}", path.display()), error))
}
Err(error) => error,
};
let held = error.kind() == std::io::ErrorKind::AlreadyExists;
if held && lock_is_stale(&path) {
tracing::warn!(lock = %path.display(), "breaking a stale config lock");
let _ = std::fs::remove_dir(&path);
continue;
}
let past_deadline = SystemTime::now() >= deadline;
match lock_wait(error.kind(), cfg!(windows)) {
LockWait::Wait if !past_deadline => std::thread::sleep(Duration::from_millis(25)),
LockWait::Wait if held => return Err(FileError::LockTimeout(path)),
_ => return Err(FileError::io(format!("locking {}", path.display()), error)),
}
}
}
}
/// What a failed `create_dir` of the lock means for the writer.
#[derive(Debug, PartialEq, Eq)]
enum LockWait {
/// Another writer has it, or is a moment from letting it go
Wait,
/// Waiting cannot help
Fail,
}
/// Whether a failed attempt at the lock is worth waiting out.
///
/// On Windows a directory being removed lingers, delete-pending, until its last handle closes, and
/// creating it then fails with access denied rather than already exists. That is the previous
/// holder letting go, so it waits too; a real permission problem still surfaces, as itself, once
/// the deadline passes. Elsewhere access denied is only ever the real thing.
fn lock_wait(kind: std::io::ErrorKind, windows: bool) -> LockWait {
match kind {
std::io::ErrorKind::AlreadyExists => LockWait::Wait,
std::io::ErrorKind::PermissionDenied if windows => LockWait::Wait,
_ => LockWait::Fail,
}
}
impl Drop for FileLock {
fn drop(&mut self) {
let _ = std::fs::remove_dir(&self.path);
@@ -264,139 +286,4 @@ fn lock_is_stale(path: &Path) -> bool {
#[cfg(test)]
#[allow(clippy::unwrap_used)]
mod tests {
use super::*;
/// A broken file is moved aside under the lock, and a later broken file does not overwrite the
/// first one set aside.
#[test]
fn a_broken_file_is_set_aside_and_never_over_an_earlier_one() {
let (dir, file) = file(FileMode::OwnerOnly);
for broken in ["{ first", "{ second"] {
std::fs::write(file.path(), broken).unwrap();
let ((), aside) = file
.modify_setting_aside(|root| {
root.insert("fresh".into(), Value::Bool(true));
Ok(())
})
.unwrap();
let aside = aside.expect("the broken file was moved");
assert_eq!(std::fs::read_to_string(&aside).unwrap(), broken);
}
assert_eq!(std::fs::read_to_string(dir.path().join("thing.json.bad")).unwrap(), "{ first");
assert_eq!(file.read().unwrap().get("fresh"), Some(&Value::Bool(true)));
}
/// The OS error is said once, whether a caller prints the message alone or walks the chain.
#[test]
fn an_io_failure_names_its_cause_once() {
let error = FileError::io("reading thing.json", std::io::Error::other("disk on fire"));
assert_eq!(error.to_string(), "reading thing.json: disk on fire");
let chain = crate::error_cause::chain(&error);
assert_eq!(chain.matches("disk on fire").count(), 1, "{chain}");
}
fn file(mode: FileMode) -> (tempfile::TempDir, JsonFile) {
let dir = tempfile::tempdir().unwrap();
let file = JsonFile::new(dir.path().join("thing.json"), mode);
(dir, file)
}
#[test]
fn an_absent_or_empty_file_reads_as_nothing() {
let (_dir, file) = file(FileMode::OwnerOnly);
assert!(file.read().is_none());
std::fs::write(file.path(), " \n").unwrap();
assert!(file.read().is_none());
}
#[test]
fn modify_preserves_every_key_it_did_not_touch() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), r#"{"keep": {"deep": 1}, "also": "me"}"#).unwrap();
file.modify(|root| {
root.insert("added".into(), Value::Bool(true));
Ok(())
})
.unwrap();
let root = file.read().unwrap();
assert_eq!(root["keep"]["deep"], 1);
assert_eq!(root["also"], "me");
assert_eq!(root["added"], true);
}
#[test]
fn a_malformed_file_blocks_the_write_and_is_left_alone() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), "{ nope").unwrap();
let error = file
.modify(|root| {
root.insert("added".into(), Value::Bool(true));
Ok(())
})
.expect_err("must refuse");
assert!(matches!(error, FileError::Unparseable { .. }), "got {error:?}");
assert_eq!(std::fs::read_to_string(file.path()).unwrap(), "{ nope");
}
#[test]
fn a_rejecting_edit_leaves_the_file_untouched() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), r#"{"a": 1}"#).unwrap();
let error = file
.modify(|_| Err::<(), _>(FileError::Rejected("no".into())))
.expect_err("propagates");
assert!(matches!(error, FileError::Rejected(_)));
assert_eq!(file.read().unwrap()["a"], 1);
assert!(!file.path().with_extension("lock").exists(), "the lock must be released");
}
#[cfg(unix)]
#[test]
fn owner_only_mode_is_enforced_and_preserve_mode_respects_the_user() {
use std::os::unix::fs::PermissionsExt;
let (_dir, secret) = file(FileMode::OwnerOnly);
secret.modify(|root| Ok(root.insert("k".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(secret.path()), Some(0o600));
let dir = tempfile::tempdir().unwrap();
let config = JsonFile::new(dir.path().join("models.json"), FileMode::PreserveExisting);
// A fresh file still starts tight.
config.modify(|root| Ok(root.insert("a".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(config.path()), Some(0o600));
// A mode the user chose survives a rewrite.
std::fs::set_permissions(config.path(), std::fs::Permissions::from_mode(0o644)).unwrap();
config.modify(|root| Ok(root.insert("b".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(config.path()), Some(0o644));
}
#[test]
fn a_stale_lock_is_broken_instead_of_blocking_forever() {
let (_dir, file) = file(FileMode::OwnerOnly);
let lock = file.path().with_extension("lock");
std::fs::create_dir(&lock).unwrap();
backdate(&lock, LOCK_STALE + Duration::from_secs(5));
file.modify(|root| Ok(root.insert("a".into(), Value::Bool(true)))).unwrap();
assert!(file.read().is_some());
}
#[test]
fn a_fresh_lock_makes_a_writer_time_out_rather_than_corrupt() {
let (_dir, file) = file(FileMode::OwnerOnly);
let lock = file.path().with_extension("lock");
std::fs::create_dir(&lock).unwrap();
let error = file.modify(|_| Ok(())).expect_err("must not write through a live lock");
assert!(matches!(error, FileError::LockTimeout(_)), "got {error:?}");
std::fs::remove_dir(&lock).unwrap();
}
/// Set an mtime in the past.
///
/// Not `touch`: `touch -d @<epoch>` is a GNU extension BSD rejects. Not `std` either, because
/// the lock is a *directory*, and opening one to set its times needs `FILE_FLAG_BACKUP_SEMANTICS`
/// on Windows, so it has to work there or the test it serves asserts that nothing happens.
fn backdate(path: &Path, by: Duration) {
let when = filetime::FileTime::from_system_time(SystemTime::now() - by);
filetime::set_file_mtime(path, when).expect("set mtime");
}
}
mod tests;

View File

@@ -0,0 +1,159 @@
use super::*;
/// A broken file is moved aside under the lock, and a later broken file does not overwrite the
/// first one set aside.
#[test]
fn a_broken_file_is_set_aside_and_never_over_an_earlier_one() {
let (dir, file) = file(FileMode::OwnerOnly);
for broken in ["{ first", "{ second"] {
std::fs::write(file.path(), broken).unwrap();
let ((), aside) = file
.modify_setting_aside(|root| {
root.insert("fresh".into(), Value::Bool(true));
Ok(())
})
.unwrap();
let aside = aside.expect("the broken file was moved");
assert_eq!(std::fs::read_to_string(&aside).unwrap(), broken);
}
assert_eq!(std::fs::read_to_string(dir.path().join("thing.json.bad")).unwrap(), "{ first");
assert_eq!(file.read().unwrap().get("fresh"), Some(&Value::Bool(true)));
}
/// Already-exists always waits; access denied waits only on Windows, where it is the previous
/// holder's directory still being removed; anything else fails at once.
#[test]
fn a_lock_waits_out_only_what_waiting_can_fix() {
use std::io::ErrorKind::{AlreadyExists, NotFound, PermissionDenied};
assert_eq!(lock_wait(AlreadyExists, false), LockWait::Wait, "another writer has it");
assert_eq!(lock_wait(PermissionDenied, true), LockWait::Wait, "Windows letting it go");
assert_eq!(lock_wait(PermissionDenied, false), LockWait::Fail, "elsewhere it is real");
assert_eq!(lock_wait(NotFound, true), LockWait::Fail, "no directory to lock in");
}
/// Elsewhere than Windows, a lock that cannot be created for want of permission fails at once
/// with the reason, rather than waiting out the deadline and calling it a timeout.
#[cfg(unix)]
#[test]
fn a_lock_without_permission_fails_with_the_reason() {
use std::os::unix::fs::PermissionsExt;
let dir = tempfile::tempdir().unwrap();
std::fs::set_permissions(dir.path(), std::fs::Permissions::from_mode(0o500)).unwrap();
let started = std::time::Instant::now();
let error = FileLock::acquire(&dir.path().join("file.json")).err().expect("refused");
std::fs::set_permissions(dir.path(), std::fs::Permissions::from_mode(0o700)).unwrap();
assert!(matches!(error, FileError::Io { .. }), "{error}");
assert!(started.elapsed() < LOCK_TIMEOUT, "it did not wait for the deadline");
}
/// The OS error is said once, whether a caller prints the message alone or walks the chain.
#[test]
fn an_io_failure_names_its_cause_once() {
let error = FileError::io("reading thing.json", std::io::Error::other("disk on fire"));
assert_eq!(error.to_string(), "reading thing.json: disk on fire");
let chain = crate::error_cause::chain(&error);
assert_eq!(chain.matches("disk on fire").count(), 1, "{chain}");
}
fn file(mode: FileMode) -> (tempfile::TempDir, JsonFile) {
let dir = tempfile::tempdir().unwrap();
let file = JsonFile::new(dir.path().join("thing.json"), mode);
(dir, file)
}
#[test]
fn an_absent_or_empty_file_reads_as_nothing() {
let (_dir, file) = file(FileMode::OwnerOnly);
assert!(file.read().is_none());
std::fs::write(file.path(), " \n").unwrap();
assert!(file.read().is_none());
}
#[test]
fn modify_preserves_every_key_it_did_not_touch() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), r#"{"keep": {"deep": 1}, "also": "me"}"#).unwrap();
file.modify(|root| {
root.insert("added".into(), Value::Bool(true));
Ok(())
})
.unwrap();
let root = file.read().unwrap();
assert_eq!(root["keep"]["deep"], 1);
assert_eq!(root["also"], "me");
assert_eq!(root["added"], true);
}
#[test]
fn a_malformed_file_blocks_the_write_and_is_left_alone() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), "{ nope").unwrap();
let error = file
.modify(|root| {
root.insert("added".into(), Value::Bool(true));
Ok(())
})
.expect_err("must refuse");
assert!(matches!(error, FileError::Unparseable { .. }), "got {error:?}");
assert_eq!(std::fs::read_to_string(file.path()).unwrap(), "{ nope");
}
#[test]
fn a_rejecting_edit_leaves_the_file_untouched() {
let (_dir, file) = file(FileMode::OwnerOnly);
std::fs::write(file.path(), r#"{"a": 1}"#).unwrap();
let error =
file.modify(|_| Err::<(), _>(FileError::Rejected("no".into()))).expect_err("propagates");
assert!(matches!(error, FileError::Rejected(_)));
assert_eq!(file.read().unwrap()["a"], 1);
assert!(!file.path().with_extension("lock").exists(), "the lock must be released");
}
#[cfg(unix)]
#[test]
fn owner_only_mode_is_enforced_and_preserve_mode_respects_the_user() {
use std::os::unix::fs::PermissionsExt;
let (_dir, secret) = file(FileMode::OwnerOnly);
secret.modify(|root| Ok(root.insert("k".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(secret.path()), Some(0o600));
let dir = tempfile::tempdir().unwrap();
let config = JsonFile::new(dir.path().join("models.json"), FileMode::PreserveExisting);
// A fresh file still starts tight.
config.modify(|root| Ok(root.insert("a".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(config.path()), Some(0o600));
// A mode the user chose survives a rewrite.
std::fs::set_permissions(config.path(), std::fs::Permissions::from_mode(0o644)).unwrap();
config.modify(|root| Ok(root.insert("b".into(), Value::Bool(true)))).unwrap();
assert_eq!(crate::fs_atomic::existing_mode(config.path()), Some(0o644));
}
#[test]
fn a_stale_lock_is_broken_instead_of_blocking_forever() {
let (_dir, file) = file(FileMode::OwnerOnly);
let lock = file.path().with_extension("lock");
std::fs::create_dir(&lock).unwrap();
backdate(&lock, LOCK_STALE + Duration::from_secs(5));
file.modify(|root| Ok(root.insert("a".into(), Value::Bool(true)))).unwrap();
assert!(file.read().is_some());
}
#[test]
fn a_fresh_lock_makes_a_writer_time_out_rather_than_corrupt() {
let (_dir, file) = file(FileMode::OwnerOnly);
let lock = file.path().with_extension("lock");
std::fs::create_dir(&lock).unwrap();
let error = file.modify(|_| Ok(())).expect_err("must not write through a live lock");
assert!(matches!(error, FileError::LockTimeout(_)), "got {error:?}");
std::fs::remove_dir(&lock).unwrap();
}
/// Set an mtime in the past.
///
/// Not `touch`: `touch -d @<epoch>` is a GNU extension BSD rejects. Not `std` either, because
/// the lock is a *directory*, and opening one to set its times needs `FILE_FLAG_BACKUP_SEMANTICS`
/// on Windows, so it has to work there or the test it serves asserts that nothing happens.
fn backdate(path: &Path, by: Duration) {
let when = filetime::FileTime::from_system_time(SystemTime::now() - by);
filetime::set_file_mtime(path, when).expect("set mtime");
}

View File

@@ -28,8 +28,8 @@ community favorites and of Omarchy's themes:
{ "theme": "nord" }
```
An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all at
[luxe.dev/themes](https://luxe.dev/themes).
An unknown name falls back to `luxe`, and Luxe says so when the session opens. See them all on
[luxe.dev](https://luxe.dev/#craft).
Code is colored by the theme too: in answers, tool cards, diffs and the preview, keywords take the
theme's `accentSecondary`, strings its `success`, numbers its `warning`, functions its `accent`,

View File

@@ -141,6 +141,28 @@ tokens() { cargo run --quiet --release -p luxe-tui --example theme_css; }
catalog() { cargo run --quiet --release -p luxe-tui --example theme_css -- --json; }
shiki() { cargo run --quiet --release -p luxe-tui --example shiki_theme -- "$@"; }
# The README's wordmark. GitHub shows an image on its own, where the CSS variables the site paints
# the letters with do not exist and every letter would fall back to black, so this copy carries
# the theme's own colors and its background: the same on GitHub's light pages as on its dark ones.
banner() {
python3 - "$1/wordmark.svg" "$1/tokens.css" <<'PY'
import re, sys
svg, css = (open(path).read() for path in sys.argv[1:])
color = lambda name: re.search(rf"--luxe-{name}:\s*(#[0-9a-f]{{6}})", css).group(1)
svg = re.sub(r"var\(--luxe-(wordmark-\d), currentColor\)", lambda m: color(m.group(1)), svg)
width, height = (int(n) for n in re.search(r'viewBox="0 0 (\d+) (\d+)"', svg).groups())
pad_x, pad_y = 120, 72
box = (width + 2 * pad_x, height + 2 * pad_y)
svg = re.sub(
r'viewBox="[^"]*" width="\d+" height="\d+"',
f'viewBox="{-pad_x} {-pad_y} {box[0]} {box[1]}" width="{box[0]}" height="{box[1]}"',
svg,
)
background = f'<rect x="{-pad_x}" y="{-pad_y}" width="{box[0]}" height="{box[1]}" rx="16" fill="{color("background")}"/>'
print(svg.replace("</title>", "</title>\n " + background, 1), end="")
PY
}
generate() {
local target="$1" guide_target="$2"
mkdir -p "${target}" "${guide_target}"
@@ -149,6 +171,7 @@ generate() {
wordmark mark >"${target}/mark.svg"
wordmark tile >"${target}/tile.svg"
tokens >"${target}/tokens.css"
banner "${target}" >"${target}/wordmark-banner.svg"
catalog >"${target}/themes.json"
facts "${target}" >"${target}/facts.json"
shiki luxe >"${target}/shiki-luxe.json"

View File

@@ -37,7 +37,6 @@ const web = fileURLToPath(new URL("../web/", import.meta.url));
/** Pages worth opening, and what has to be alive on each once it has settled. */
const PAGES = [
{ path: "/", demos: true, stills: true },
{ path: "/themes/", demos: false, stills: false },
{ path: "/docs/", demos: false, stills: false },
];

View File

@@ -37,7 +37,6 @@ const PAGES = [
shine: ".hero__mark .wordmark",
captures: true,
},
{ path: "/themes/", expect: [".theme__name", ".masthead__mark"] },
// The measured bars come from a JSON a script writes, the part that could go missing
{ path: "/tools/", expect: [".bench__bar", ".contrast", ".masthead__mark"] },
{ path: "/docs/", expect: [".docs__body", ".docs__nav"] },

5
web/public/_redirects Normal file
View File

@@ -0,0 +1,5 @@
# Cloudflare Pages redirects: source, destination, status.
#
# The themes page folded into the homepage's gallery; a link to it lands on the gallery.
/themes /#craft 301
/themes/ /#craft 301

View File

@@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-120 -72 680 298" width="680" height="298" data-cell="10 22" role="img" aria-label="Luxe">
<title>Luxe</title>
<rect x="-120" y="-72" width="680" height="298" rx="16" fill="#12100e"/>
<path fill="#6d5f43" d="M10 11h10v11h-10z M20 11h10v11h-10z M30 11h10v11h-10z M40 11h10v11h-10z M10 22h10v11h-10z M20 22h10v11h-10z M30 22h20v22h-20z M30 44h20v22h-20z M30 66h20v22h-20z M30 88h20v22h-20z M30 110h20v22h-20z M50 121h10v11h-10z M60 121h10v11h-10z M70 121h10v11h-10z M40 132h10v11h-10z M50 132h10v11h-10z M60 132h10v11h-10z M70 132h10v11h-10z"/>
<path fill="#7e6d4d" d="M110 44h20v22h-20z M170 44h20v22h-20z M110 66h20v22h-20z M170 66h20v22h-20z M110 88h20v22h-20z M170 88h20v22h-20z M110 110h20v22h-20z M130 121h10v11h-10z M140 121h10v11h-10z M150 121h10v11h-10z M160 110h30v22h-30z M120 132h10v11h-10z M130 132h10v11h-10z M140 132h10v11h-10z M150 132h10v11h-10z M170 132h10v11h-10z M180 132h10v11h-10z"/>
<path fill="#a59064" d="M210 44h10v11h-10z M220 44h20v22h-20z M260 44h20v22h-20z M280 44h10v11h-10z M230 66h40v22h-40z M230 99h10v11h-10z M240 88h20v22h-20z M260 99h10v11h-10z M220 121h10v11h-10z M230 110h10v22h-10z M240 110h10v11h-10z M250 110h10v11h-10z M260 110h10v22h-10z M270 121h10v11h-10z M210 132h10v11h-10z M220 132h10v11h-10z M230 132h10v11h-10z M260 132h10v11h-10z M270 132h10v11h-10z M280 132h10v11h-10z"/>
<path fill="#cdb27a" d="M320 55h10v11h-10z M330 44h40v22h-40z M370 55h10v11h-10z M310 66h20v22h-20z M330 77h10v11h-10z M340 77h10v11h-10z M350 77h10v11h-10z M360 77h10v11h-10z M370 66h20v22h-20z M310 88h20v22h-20z M330 88h10v11h-10z M340 88h10v11h-10z M350 88h10v11h-10z M360 88h10v11h-10z M370 88h10v11h-10z M380 88h10v11h-10z M310 110h10v11h-10z M320 110h20v22h-20z M340 121h10v11h-10z M350 121h10v11h-10z M360 121h10v11h-10z M370 121h10v11h-10z M380 110h10v22h-10z M330 132h10v11h-10z M340 132h10v11h-10z M350 132h10v11h-10z M360 132h10v11h-10z M370 132h10v11h-10z"/>
<path fill="#ddc084" d="M420 110h20v22h-20z M420 132h10v11h-10z M430 132h10v11h-10z"/>
</svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -26,8 +26,6 @@
palette: Record<string, Record<string, string>>;
/** The variable the preview paints its canvas with, so the frame around it matches. */
canvas: string;
/** List every token with its value under the preview. */
swatches?: boolean;
/** Take turns through the themes on a timer. */
cycle?: boolean;
/** Put the theme chips under the picture rather than over it. */
@@ -39,7 +37,6 @@
themes,
palette,
canvas,
swatches = false,
cycle = false,
chipsBelow = false,
children,
@@ -93,7 +90,6 @@
});
const showing = $derived(pointed ?? pinned);
const tokens = $derived(themes[showing] ?? {});
/** The preview's palette, as inline custom properties on its frame. */
const style = $derived(
@@ -154,17 +150,6 @@
{@render chips()}
{/if}
{#if swatches}
<dl class="swatches">
{#each Object.entries(tokens) as [name, hex] (name)}
<div class="swatch">
<span class="swatch__chip" style={`background: ${hex}`}></span>
<dt>{name}</dt>
<dd>{hex}</dd>
</div>
{/each}
</dl>
{/if}
</div>
<style>
@@ -241,38 +226,6 @@
stroke 180ms ease;
}
.swatches {
display: grid;
padding-bottom: var(--space-2);
grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));
gap: var(--space-1) var(--space-3);
margin: 0;
font-size: var(--step--2);
}
.swatch {
display: flex;
align-items: center;
gap: 0.6em;
}
.swatch__chip {
width: 1em;
height: 1em;
border: 1px solid var(--luxe-border);
flex: none;
}
.swatch dt {
color: var(--luxe-text);
}
.swatch dd {
margin: 0;
color: var(--luxe-muted);
font-variant-numeric: tabular-nums;
}
@media (prefers-reduced-motion: reduce) {
.chip,
.preview__frame,

View File

@@ -12,14 +12,12 @@ import palette from "../assets/generated/theme-preview.json";
import catalog from "../assets/generated/themes.json";
interface Props {
/** List every token of the theme on show, for the page that is about the palettes. */
swatches?: boolean;
/** Take turns through the themes on their own. */
cycle?: boolean;
/** Put the theme chips under the picture, where they read better on a narrow screen. */
chipsBelow?: boolean;
}
const { swatches = false, cycle = false, chipsBelow = false } = Astro.props;
const { cycle = false, chipsBelow = false } = Astro.props;
// The frame around the picture wears the picture's own canvas, which is its first rectangle
const canvas = svg.match(/^<svg[^>]*>\s*<rect [^>]*fill="var\(--(p\d+),/)?.[1];
@@ -31,7 +29,6 @@ if (!canvas) throw new Error("theme-preview.svg has no canvas variable — run s
themes={catalog as Record<string, Record<string, string>>}
{palette}
{canvas}
{swatches}
{cycle}
{chipsBelow}
>

View File

@@ -32,9 +32,10 @@ const year = new Date().getFullYear();
const nav = [
{ href: "/docs", label: "Docs" },
{ href: "/tools", label: "Tools" },
{ href: "/themes", label: "Themes" },
{ href: repo, label: "GitHub" },
];
// GitHub's mark, from Primer's octicons (MIT): the header's repository link and the footer's profile
const githubMark =
"M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z";
---
<!doctype html>
@@ -72,6 +73,10 @@ const nav = [
</a>
<nav class="masthead__nav">
{nav.map(({ href, label }) => <a href={href}>{label}</a>)}
{/* The mark says GitHub on its own, and leaves room for the nav beside the wordmark on a phone */}
<a class="masthead__repo" href={repo} aria-label="Luxe on GitHub" title="Luxe on GitHub">
<svg viewBox="0 0 16 16" aria-hidden="true" focusable="false"><path d={githubMark}></path></svg>
</a>
</nav>
</div>
</header>
@@ -85,12 +90,8 @@ const nav = [
<p class="muted footer__owner">
&copy; {year}
<a class="footer__profile" href="https://github.com/evanwhittaker">
{/* GitHub's mark, from Primer's octicons (MIT) */}
<svg viewBox="0 0 16 16" aria-hidden="true" focusable="false">
<path
d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
></path>
</svg>evanwhittaker</a
<svg viewBox="0 0 16 16" aria-hidden="true" focusable="false"><path d={githubMark}></path></svg
>evanwhittaker</a
>
</p>
<p class="muted footer__meta">
@@ -208,6 +209,20 @@ const nav = [
color: var(--luxe-accent);
}
/* A touch target the size of a word beside it, not of the 18px mark inside it */
.masthead__repo {
display: inline-flex;
align-items: center;
padding: 0.35em;
margin: -0.35em;
}
.masthead__repo svg {
width: 1.45em;
height: 1.45em;
fill: currentColor;
}
.footer {
border-top: var(--border);
padding-block: var(--space-5);
@@ -259,18 +274,15 @@ const nav = [
}
}
/* Below this the mark and the nav cannot share a line without the theme toggle falling off the
end of it, so they take one each. Dropping a link instead would be cheaper and worse. */
@media (max-width: 34rem) {
.masthead__inner {
flex-direction: column;
align-items: flex-start;
gap: var(--space-3);
/* Two words and a mark fit beside the wordmark on any phone, so the header stays one row; the
narrowest screens get a smaller mark and tighter letters rather than a second line */
@media (max-width: 24rem) {
.masthead__mark {
width: 70px;
}
.masthead__nav {
width: 100%;
justify-content: space-between;
letter-spacing: 0.1em;
}
}
</style>

View File

@@ -1,182 +0,0 @@
---
import Base from "../layouts/Base.astro";
import ThemePreview from "../components/ThemePreview.astro";
import themeCss from "../assets/generated/tokens.css?raw";
/**
* The palette, with its numbers attached.
*
* Swatches are read out of the generated stylesheet rather than typed here, so this page cannot
* disagree with the theme the terminal loads.
*/
const readTokens = (block: string) =>
[...block.matchAll(/--luxe-([a-z-]+):\s*(#[0-9a-f]{6});/g)].map(([, name, hex]) => ({ name, hex }));
const modes = [
{ label: "luxe", note: "warm graphite, champagne brass", tokens: readTokens(themeCss) },
];
/** Relative luminance, so each chip can print its own contrast rather than claim one. */
function contrast(a: string, b: string) {
const lum = (hex: string) => {
const parts = [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16) / 255);
const [r, g, bl] = parts.map((c) => (c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4));
return 0.2126 * r + 0.7152 * g + 0.0722 * bl;
};
const [hi, lo] = [lum(a), lum(b)].sort((x, y) => y - x);
return (hi + 0.05) / (lo + 0.05);
}
---
<Base title="Themes — Luxe" description="Luxe's palette, and the community favorites it ships with.">
<div class="page">
<section class="section section--head">
<p class="eyebrow">Themes</p>
<h1>Color that means something.</h1>
<div class="prose">
<p>
Luxe's own palette is warm graphite with a champagne-brass accent, and its hues come from a
set of paint colors rather than a terminal convention. Those are mid-luminance by nature,
so the hues were kept and the lightness re-derived against a contrast floor.
</p>
<p>
Three rules do the work, and each one is asserted in the test suite rather than eyeballed:
every background and gray shares one neutral hue, every accent sits on one lightness
plateau so none of them shouts, and nothing drops below 4.5:1 on its own background.
</p>
</div>
</section>
{
modes.map(({ label, note, tokens }) => {
const background = tokens.find((t) => t.name === "background")!.hex;
return (
<section class="section">
<div class="theme__head">
<h2 class="theme__name">{label}</h2>
<p class="muted theme__note">{note}</p>
</div>
<ul class="swatches">
{tokens
.filter(
(t) =>
!t.name.startsWith("wordmark") &&
!t.name.startsWith("capture") &&
t.name !== "tile-ink",
)
.map(({ name, hex }) => (
<li class="swatch">
<span class="swatch__chip" style={`background:${hex}`} />
<span class="swatch__name">{name}</span>
<span class="swatch__hex">{hex}</span>
<span class="swatch__ratio">
{name === "background" ? "—" : `${contrast(hex, background).toFixed(1)}:1`}
</span>
</li>
))}
</ul>
</section>
);
})
}
<section class="section section--last">
<h2>And plenty you may already use.</h2>
<div class="prose">
<p>
Ports that stay true to their originals. Luxe only steps in where a color is too faint to
read a word in, or where a theme's "red" isn't red, since a failed test shown in green
says the opposite of what happened.
</p>
<p>
Point at one to see it. That's how <code>/theme</code> works in the terminal too: the
cursor moves and the whole app repaints, because a palette isn't something you can judge
from its name.
</p>
</div>
<ThemePreview swatches />
<p class="muted">
Set one with <code>"theme": "nord"</code> in <code>~/.config/luxe/config.json</code>, or
override individual tokens with a <code>colors</code> map. On Omarchy, Luxe wears your
desktop's theme and changes with it when you switch.
</p>
</section>
</div>
</Base>
<style>
.section--head {
border-top: 0;
padding-top: var(--space-6);
}
.section--last {
border-bottom: 0;
}
.prose {
max-width: var(--measure);
margin-top: var(--space-4);
}
.theme__head {
display: flex;
align-items: baseline;
gap: var(--space-3);
flex-wrap: wrap;
}
.theme__name {
font-family: var(--font-mono);
font-size: var(--step-1);
letter-spacing: 0;
}
.theme__note {
margin: 0;
font-size: var(--step--1);
}
.swatches {
list-style: none;
padding: 0;
margin: var(--space-4) 0 0;
display: grid;
gap: var(--space-2) var(--space-4);
grid-template-columns: repeat(auto-fill, minmax(17rem, 1fr));
}
.swatch {
display: grid;
grid-template-columns: 1.6rem 1fr auto auto;
align-items: center;
gap: var(--space-2);
font-size: var(--step--1);
padding-block: 0.3rem;
border-bottom: 1px solid var(--luxe-border-muted);
}
.swatch__chip {
width: 1.6rem;
height: 1.6rem;
box-shadow: inset 0 0 0 1px color-mix(in oklab, var(--luxe-text) 18%, transparent);
}
.swatch__name {
color: var(--luxe-text);
}
.swatch__hex,
.swatch__ratio {
color: var(--luxe-muted);
font-variant-numeric: tabular-nums;
}
.swatch__ratio {
min-width: 4ch;
text-align: right;
}
</style>

View File

@@ -223,7 +223,7 @@ const rows = new Map(
[...bench.repositories].reverse().flatMap((repo) => repo.rows.map((row) => [row.id, row])),
);
for (const row of primary.rows) rows.set(row.id, row);
/** The tightest of the four other agents' limits on the same output: Codex's. */
/** The tightest of the other agents' limits on the same output: Codex's. */
const tightest = (row: { forwarded: Record<string, number> }) =>
Math.min(...Object.values(row.forwarded));
@@ -240,9 +240,13 @@ const tokens = (bytes: number) => {
const count = bytes / 4;
if (count < 1000) return `${Math.max(1, Math.round(count / 10) * 10)} tokens`;
if (count < 10_000) return `${(count / 1000).toFixed(1)}k tokens`;
return `${Math.round(count / 1000)}k tokens`;
if (count < 1_000_000) return `${Math.round(count / 1000)}k tokens`;
return `${(count / 1_000_000).toFixed(1)}M tokens`;
};
/** The head's terminal: the commands whose output Luxe's tool cuts the most, measured like the rest. */
const terminal = ["git", "module_report", "glob"].flatMap((id) => rows.get(id) ?? []);
const times = (shell: number, tool: number) => {
const ratio = shell / tool;
if (ratio < 1.1) return "the same";
@@ -262,12 +266,24 @@ const versus = (cut: number, tool: number) => {
*/
type Other = { warm: number; cold: number; passed: number; runs: number };
type CostRow = { model: string; luxe: { passed: number; runs: number } } & Partial<
Record<"claude" | "codex" | "opencode" | "pi", Other>
Record<"claude" | "codex" | "opencode", Other>
>;
const costRows = agentCost.rows as CostRow[];
const vendorAgent = (row: CostRow) => row.claude ?? row.codex;
const multiple = (other?: Other) => (other ? `${other.cold.toFixed(2)}×` : "–");
/** The chart's scale: the costliest multiple, rounded up to a half, so 1× (Luxe) sits at a fixed mark. */
const chartScale =
Math.ceil(
Math.max(...costRows.flatMap((row) => [vendorAgent(row)?.cold ?? 0, row.opencode?.cold ?? 0])) * 2,
) / 2;
const chartWidth = (multiple: number) => `${(multiple / chartScale) * 100}%`;
const chartBars = (row: CostRow) =>
[
{ kind: "vendor", other: vendorAgent(row) },
{ kind: "opencode", other: row.opencode },
].flatMap(({ kind, other }) => (other ? [{ kind, cold: other.cold }] : []));
/** A bar's share of its row, never so thin it disappears. */
const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100, 0.6)}%`;
---
@@ -278,6 +294,8 @@ const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100,
>
<div class="page">
<section class="section section--head">
<div class="split">
<div>
<p class="eyebrow">Tools</p>
<h1>Better than the shell.</h1>
<div class="prose">
@@ -294,33 +312,61 @@ const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100,
Measured in a checkout of {primary.name} at <code>{primary.commit}</code>, the codebase
the harness eval runs in, with its virtualenv in place. The shell row is the command's
raw output; <em>tightest cut</em> is the least any other agent sends its model of it,
which is Codex's 10 KB, head and tail kept. Pi and OpenCode keep up to 50 KB and Claude
Code 30,000 characters. A token is about four bytes.
which is Codex's 10 KB, head and tail kept. OpenCode keeps up to 50 KB and Claude Code
30,000 characters. A token is about four bytes.
</p>
<p class="muted note">
Those are single calls, and across a whole task the bars shrink, because most calls are
small to begin with. What a whole task costs is <a href="#tasks">below</a>.
</p>
</div>
</div>
{/* The claim, shown: what the model reads back from a shell command, then from the tool */}
<figure class="terminal">
<div class="terminal__bar">
<span class="terminal__dots" aria-hidden="true"><i></i><i></i><i></i></span>
<span>{primary.name.toLowerCase()} @ {primary.commit}</span>
</div>
<dl class="terminal__body">
{
terminal.map((row) => (
<div class="terminal__pair">
<dt>
<span class="terminal__prompt">$</span>
{row.shell}
</dt>
<dd>{tokens(row.shellBytes)}</dd>
<dt class="terminal__luxe">
<span class="terminal__prompt">luxe</span>
{row.tool}
</dt>
<dd class="terminal__luxe">{tokens(row.toolBytes)}</dd>
</div>
))
}
</dl>
<figcaption class="terminal__caption">What the model reads back, measured.</figcaption>
</figure>
</div>
</section>
<section class="section group" id="tasks">
<h2 class="group__name">Whole tasks</h2>
<div class="prose">
<p>
Luxe, Claude Code, Codex, OpenCode and Pi each ran the first twelve Django tasks of
Luxe, Claude Code, Codex and OpenCode each ran the first twelve Django tasks of
SWE-bench Verified Mini, with the same model, the same prompt and the same keys, every
call metered at the network and priced from one list. Each figure is what the other agent
spent on the same task, as a multiple of what Luxe spent: above 1× costs more than Luxe.
</p>
</div>
<div class="split split--tasks">
<table class="costs">
<thead>
<tr>
<th scope="col">Model</th>
<th scope="col">Claude Code or Codex</th>
<th scope="col">OpenCode</th>
<th scope="col">Pi</th>
</tr>
</thead>
<tbody>
@@ -332,19 +378,40 @@ const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100,
</th>
<td>{multiple(vendorAgent(row))}</td>
<td>{multiple(row.opencode)}</td>
<td>{multiple(row.pi)}</td>
</tr>
))
}
</tbody>
</table>
{/* The table's numbers drawn; hidden from screen readers, which have the table */}
<figure class="chart" aria-hidden="true" style={`--one: ${chartWidth(1)}`}>
<figcaption class="chart__legend">
<span class="chart__key chart__key--vendor">Claude Code or Codex</span>
<span class="chart__key chart__key--opencode">OpenCode</span>
<span class="chart__key chart__key--luxe">Luxe, 1×</span>
</figcaption>
{
costRows.map((row) => (
<div class="chart__group">
<code class="chart__model">{row.model}</code>
{chartBars(row).map(({ kind, cold }) => (
<div class={`chart__row chart__row--${kind}`}>
<span class="chart__track">
<span class="chart__bar" style={`width: ${chartWidth(cold)}`} />
</span>
<span class="chart__value">{cold.toFixed(2)}×</span>
</div>
))}
</div>
))
}
</figure>
</div>
<div class="prose">
<p class="muted note">
Every run is charged as a cold start, the way a session begins after a break. Run side
by side on a warm cache, Claude Code and OpenCode cost up to 2.6× what Luxe does on
Claude models. Pass rates overlapped on every model. Pi is the cheapest by design: four
tools and a short prompt, with web search, MCP and the rest left to extensions. Graded
on one machine rather than in SWE-bench's own containers, so these are not leaderboard
Claude models. Pass rates overlapped on every model. Graded on one machine rather than in SWE-bench's own containers, so these are not leaderboard
scores. Measured at <code>{agentCost.commit}</code>.
</p>
</div>
@@ -537,6 +604,190 @@ const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100,
margin-bottom: var(--space-2) !important;
}
/* The words, and beside them what they claim, drawn; one column once there is no room. Shares
rather than a fixed text column: the prose keeps its own measure, and the drawing gets room for
its longest command just above the breakpoint */
.split {
display: grid;
grid-template-columns: minmax(0, 1.2fr) minmax(0, 1fr);
gap: var(--space-5) var(--space-6);
align-items: center;
}
.split--tasks {
grid-template-columns: auto minmax(0, 1fr);
align-items: start;
margin-top: var(--space-5);
}
.split--tasks .costs {
margin-top: 0;
}
/* === The head's terminal === */
.terminal {
margin: 0;
background: var(--luxe-user-msg-bg);
border: var(--border);
font-size: var(--step--1);
}
.terminal__bar {
display: flex;
align-items: center;
gap: var(--space-3);
padding: var(--space-2) var(--space-3);
border-bottom: var(--border);
color: var(--luxe-dim);
}
.terminal__dots {
display: inline-flex;
gap: 0.4em;
}
.terminal__dots i {
display: inline-block;
width: 0.6em;
height: 0.6em;
border-radius: 50%;
background: var(--luxe-dim);
}
.terminal__body {
margin: 0;
padding: var(--space-3);
display: grid;
gap: var(--space-3);
}
.terminal__pair {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: var(--space-1) var(--space-3);
}
.terminal__pair dt {
color: var(--luxe-muted);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.terminal__pair dd {
margin: 0;
text-align: right;
color: var(--luxe-muted);
font-variant-numeric: tabular-nums;
}
.terminal__prompt {
color: var(--luxe-dim);
margin-right: 0.6em;
}
.terminal__pair .terminal__luxe {
color: var(--luxe-accent);
}
.terminal__caption {
padding: 0 var(--space-3) var(--space-3);
color: var(--luxe-dim);
font-size: var(--step--2);
}
/* === The whole-task chart === */
.chart {
margin: 0;
display: grid;
gap: var(--space-3);
font-size: var(--step--1);
}
.chart__legend {
display: flex;
flex-wrap: wrap;
gap: var(--space-2) var(--space-4);
color: var(--luxe-muted);
}
.chart__key::before {
content: "";
display: inline-block;
width: 0.8em;
height: 0.8em;
margin-right: 0.5em;
vertical-align: -0.05em;
}
.chart__key--vendor::before {
background: var(--luxe-dim);
}
.chart__key--opencode::before {
background: var(--luxe-muted);
}
.chart__key--luxe::before {
width: 2px;
height: 1em;
background: var(--luxe-accent);
}
.chart__group {
display: grid;
gap: 0.3em;
}
.chart__model {
color: var(--luxe-accent);
}
.chart__row {
display: grid;
grid-template-columns: minmax(0, 1fr) 4rem;
align-items: center;
gap: var(--space-3);
}
.chart__track {
position: relative;
height: 0.9rem;
background: var(--luxe-user-msg-bg);
}
/* Luxe's 1×, drawn through every row: each bar is read against it */
.chart__track::after {
content: "";
position: absolute;
top: -0.2rem;
bottom: -0.2rem;
left: var(--one);
width: 2px;
background: var(--luxe-accent);
}
.chart__bar {
display: block;
height: 100%;
}
.chart__row--vendor .chart__bar {
background: var(--luxe-dim);
}
.chart__row--opencode .chart__bar {
background: var(--luxe-muted);
}
.chart__value {
text-align: right;
color: var(--luxe-text);
font-variant-numeric: tabular-nums;
}
/* === Measured === */
.bench {
@@ -678,7 +929,9 @@ const share = (shell: number, tool: number) => `${Math.max((tool / shell) * 100,
}
@media (max-width: 68rem) {
.tool {
.tool,
.split,
.split--tasks {
grid-template-columns: minmax(0, 1fr);
}
}