mirror of
https://github.com/max-sixty/worktrunk.git
synced 2026-09-14 20:00:38 +08:00
dd453304ed
`cargo test --test integration` neither built nor rebuilt `mock-stub`: a
target filter deselects the dummy test that pulled it in, so a fresh
tree panicked ("mock-stub binary not found") and a warm one could run a
stale stub. The chain that compensated — the separate helper package,
its dummy `builds.rs`, the `default-members` entry, nextest's
experimental `build-bins` setup script, `workspace_bin()` — existed only
because cargo-dist ships every `[[bin]]`, and carried a TODO to collapse
once that changed. dist 0.30.2 does support per-binary exclusion now
(`[dist.binaries]`, since 0.29.0; verified with `dist plan`), but the
TODO's plan has a hole it predates: `cargo install worktrunk` installs
every feature-satisfied `[[bin]]`, and dist config doesn't govern
crates.io installs.
So the mock commands are now the `wt` binary itself. `mock_commands`
links `wt` under the mock's name (`gh`, `glab`, …), and `main()`
dispatches to the ported playback (`testing::mock_stub`) when
`WORKTRUNK_TEST_MOCK_CONFIG_DIR` is set, argv[0] is a foreign name, and
the config dir holds `<argv0>.json` for it. The existence check keeps wt
under a foreign argv[0] *without* a config being wt — the
argv0-validation security test symlinks it as `wt;touch` and must reach
wt's own rejection. The shipped binary already compiles the whole
`testing` module unconditionally, so this adds no new category of test
code to it. Windows links `wt.exe` with `hard_link` (copy fallback for
cross-drive dirs); the debug binary is ~67 MB, so per-mock copies stay
the fallback.
Every runner is now safe by construction — cargo rebuilds a package's
own binaries whenever its integration tests build, so there is no
separate artifact to go missing or stale. Deleted: the helper package,
the setup script plus `experimental = ["setup-scripts"]`, the
`default-members` trick, `workspace_bin()`, and `wt_bin()`'s dead
compile-time branch (unit-test targets get neither the runtime variable
nor the `option_env!` value, so the runtime resolution is the one
mechanism).
Validated locally: the pre-merge gate's full suite passes (4542/4542;
its doc step also caught unescaped `argv[0]` intra-doc links in the new
comments, fixed and `cargo doc -Dwarnings` re-verified). With all stub
artifacts purged from `target/`, plain `cargo test --test integration`
on mock-dependent tests builds them and passes — the command that used
to hit the trap. Two integration tests pin the dispatch's argv[0] edges
(an empty argv[0], and a non-UTF8 one), alongside the existing
`wt;touch` carve-out test.
The first commit is the investigation that preceded the fix: it verified
the `wt` binary itself was never subject to the staleness the mock-stub
was, and documented that in `tests/CLAUDE.md`; the fix then narrows that
paragraph further, since the gap it scoped no longer exists.
A two-reviewer subagent round (one prosecuting the diff against the
failure modes documented in the repo's own mock history — the #401/#407
Windows era, #547, #654, #127, #2544, #2730, #2744 — the other
adversarial) then hardened the dispatch. The reserved-name guard is
case-insensitive, matching the config probe, which goes through a
filesystem that equates `WT.json` with `wt.json` on macOS and Windows;
`command_name()` reads `args_os` — `env::args()` panics on a non-Unicode
argument, and this runs inside `main()` on every invocation (caught by
the tend review) — and returns `None` for a degenerate argv[0] instead
of panicking; the `.exe` suffix is stripped explicitly rather than via
`file_stem`, so a dotted mock name (`python3.11`) resolves identically
on every platform; and `copy_mock_binary` is now private —
`MockConfig::write` writes `<name>.json` before linking and is the only
way to create a mock, so a link cannot exist without its config, and the
dispatch's missing-config fall-through can only mean "wt under a foreign
name" (the argv0-validation tests' `wt;touch`), never a half-configured
mock that silently runs real wt with the mocked tool's arguments. The
`Option<&str>` mock helpers whose `None` arm produced exactly such
configless links lost the arm (every caller passed `Some`), and 25
redundant standalone link calls went with it.
The review also surfaced the one remaining spawn-a-stale-binary path
outside the suite: `wt-perf timeline` resolved a sibling `wt` by path,
checked only existence, and told the user to build it manually — so
`cargo run -p wt-perf -- timeline` after a `src/` edit silently measured
stale code. It now builds `wt` first and takes the artifact path from
cargo's `--message-format=json` report rather than deriving a sibling
location, so target-dir and profile overrides can't divert the build
away from where it's resolved; a release wt-perf builds and measures a
release wt. The build runs before the timeline's wall-clock measurement
starts, cargo's progress streams on stderr, and stdout keeps the
`--chrome` JSON contract.
> _This was written by Claude Code on behalf of max-sixty_
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
441 lines
15 KiB
YAML
441 lines
15 KiB
YAML
# https://taskfile.dev
|
|
version: "3"
|
|
|
|
vars:
|
|
REPO_ROOT:
|
|
sh: pwd
|
|
STATIC_DIR: "{{.REPO_ROOT}}/docs/static"
|
|
ASSETS_DIR: "{{.STATIC_DIR}}/assets"
|
|
|
|
tasks:
|
|
# Development
|
|
coverage:
|
|
desc: Run tests with coverage report
|
|
cmd: cargo llvm-cov nextest --html --features shell-integration-tests {{.CLI_ARGS}}
|
|
|
|
profile-tests:
|
|
desc: Run the suite under CPU accounting and report where the time goes
|
|
# tests/CLAUDE.md → Profiling the Suite covers how to read the numbers.
|
|
cmds:
|
|
# Build first so the measurement covers the test run alone.
|
|
- cargo nextest run --no-run --features shell-integration-tests
|
|
# bash's `time` keyword counts every reaped child. Task's own interpreter
|
|
# (mvdan/sh) parses `time` but reports user/sys as zero, and /usr/bin/time
|
|
# is an extra package on minimal Linux; bash is present on every dev and
|
|
# CI platform (Git Bash on Windows).
|
|
- bash -c 'time "$@"' bash cargo nextest run --features shell-integration-tests {{.CLI_ARGS}}
|
|
- echo "per-test timings in target/nextest/default/junit.xml"
|
|
|
|
setup-web:
|
|
desc: Setup Claude Code web environment for development
|
|
platforms: [linux]
|
|
cmds:
|
|
- |
|
|
set -e
|
|
echo "========================================"
|
|
echo "Claude Code Web - Worktrunk Setup"
|
|
echo "========================================"
|
|
|
|
# Check project root
|
|
if [ ! -f "Cargo.toml" ] || ! grep -q 'name = "worktrunk"' Cargo.toml; then
|
|
echo "Error: Must be run from worktrunk project root"
|
|
exit 1
|
|
fi
|
|
echo "Found worktrunk project"
|
|
|
|
# Check/install Rust
|
|
echo ""
|
|
echo "Checking Rust toolchain..."
|
|
if ! command -v cargo &> /dev/null; then
|
|
echo "Cargo not found. Installing Rust..."
|
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
|
source "$HOME/.cargo/env"
|
|
fi
|
|
echo "Rust version: $(rustc --version | awk '{print $2}')"
|
|
|
|
# Install shells
|
|
echo ""
|
|
echo "Installing shells for integration tests..."
|
|
if command -v apt-get &> /dev/null; then
|
|
export DEBIAN_FRONTEND=noninteractive
|
|
for f in /etc/apt/sources.list.d/*.list; do
|
|
[ -f "$f" ] && grep -q '^\[' "$f" 2>/dev/null && rm -f "$f"
|
|
done
|
|
if ! command -v zsh &> /dev/null || ! command -v fish &> /dev/null; then
|
|
apt-get update -qq
|
|
apt-get install -y -qq zsh fish
|
|
fi
|
|
fi
|
|
for shell in bash zsh fish nu; do
|
|
command -v "$shell" &> /dev/null || { echo "Error: $shell not found"; exit 1; }
|
|
echo "$shell available"
|
|
done
|
|
|
|
# Install gh CLI
|
|
echo ""
|
|
echo "Installing GitHub CLI..."
|
|
if command -v gh &> /dev/null; then
|
|
echo "gh already installed"
|
|
else
|
|
GH_VERSION="2.63.2"
|
|
ARCH="linux_amd64"
|
|
URL="https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_${ARCH}.tar.gz"
|
|
mkdir -p ~/bin
|
|
TEMP=$(mktemp -d)
|
|
curl -fsSL "$URL" | tar -xz -C "$TEMP"
|
|
mv "$TEMP/gh_${GH_VERSION}_${ARCH}/bin/gh" ~/bin/gh
|
|
chmod +x ~/bin/gh
|
|
rm -rf "$TEMP"
|
|
export PATH="$HOME/bin:$PATH"
|
|
echo "gh installed to ~/bin/gh"
|
|
fi
|
|
|
|
# Build
|
|
echo ""
|
|
echo "Building worktrunk..."
|
|
cargo build 2>&1 | tail -5
|
|
echo "Build successful"
|
|
|
|
# Install dev tools
|
|
echo ""
|
|
echo "Installing development tools..."
|
|
cargo install cargo-insta cargo-nextest --quiet
|
|
cargo install --path . --quiet
|
|
echo "Installed cargo-insta, cargo-nextest, worktrunk"
|
|
|
|
echo ""
|
|
echo "Setup complete! Run 'wt --help' to get started."
|
|
|
|
# Assets
|
|
fetch-assets:
|
|
desc: Fetch assets from worktrunk-assets repo
|
|
cmds:
|
|
- |
|
|
set -euo pipefail
|
|
echo "Fetching assets..."
|
|
rm -rf "{{.ASSETS_DIR}}"
|
|
mkdir -p "{{.ASSETS_DIR}}"
|
|
TMPFILE=$(mktemp)
|
|
curl -fsSL "https://github.com/max-sixty/worktrunk-assets/archive/refs/heads/main.tar.gz" -o "$TMPFILE"
|
|
tar -xzf "$TMPFILE" --strip-components=2 -C "{{.ASSETS_DIR}}" "worktrunk-assets-main/assets"
|
|
rm "$TMPFILE"
|
|
echo "Done. Assets in {{.ASSETS_DIR}}/"
|
|
|
|
publish-assets:
|
|
desc: Publish assets to worktrunk-assets repo
|
|
dir: "{{.REPO_ROOT}}"
|
|
cmds:
|
|
- |
|
|
set -euo pipefail
|
|
ASSETS_REPO="../worktrunk-assets"
|
|
LOCAL_ASSETS="{{.ASSETS_DIR}}"
|
|
|
|
# Clone if needed
|
|
if [[ ! -d "$ASSETS_REPO/.git" ]]; then
|
|
if ! command -v gh &>/dev/null; then
|
|
echo "Error: gh CLI required. Install from https://cli.github.com/"
|
|
exit 1
|
|
fi
|
|
echo "Cloning assets repo..."
|
|
gh repo clone max-sixty/worktrunk-assets "$ASSETS_REPO" || {
|
|
echo "Failed to clone assets repo"
|
|
exit 1
|
|
}
|
|
fi
|
|
|
|
cd "$ASSETS_REPO"
|
|
git pull --ff-only || {
|
|
echo "Failed to update assets repo. Check for uncommitted changes."
|
|
exit 1
|
|
}
|
|
|
|
rsync -av --delete "$LOCAL_ASSETS/" "$ASSETS_REPO/assets/"
|
|
|
|
if git diff --quiet; then
|
|
echo "No changes to publish"
|
|
exit 0
|
|
fi
|
|
|
|
# Check for deletions - require manual publish if files were removed
|
|
if git status --porcelain | grep -q '^ D'; then
|
|
echo "Deletions detected:"
|
|
git status --porcelain | grep '^ D'
|
|
echo ""
|
|
echo "Publish manually in $ASSETS_REPO if this is correct"
|
|
exit 1
|
|
fi
|
|
|
|
git diff --stat
|
|
git add -A
|
|
git commit -m "Update assets"
|
|
git push
|
|
|
|
echo ""
|
|
echo "Published: https://github.com/max-sixty/worktrunk-assets"
|
|
|
|
# Social cards and logo
|
|
build-social-cards:
|
|
desc: Build social card PNGs from SVG sources
|
|
dir: "{{.STATIC_DIR}}"
|
|
preconditions:
|
|
- sh: command -v rsvg-convert
|
|
msg: "rsvg-convert required. Install with: brew install librsvg"
|
|
cmds:
|
|
- |
|
|
set -euo pipefail
|
|
FONT_DIR="{{.REPO_ROOT}}/.fonts"
|
|
OUTPUT_DIR="{{.ASSETS_DIR}}/social"
|
|
|
|
ensure_font() {
|
|
local name="$1"
|
|
local url="$2"
|
|
if fc-list | grep -qi "$name"; then
|
|
return 0
|
|
fi
|
|
echo "Downloading $name..."
|
|
mkdir -p "$FONT_DIR"
|
|
local zip="$FONT_DIR/${name// /_}.zip"
|
|
curl -fsSL "$url" -o "$zip"
|
|
unzip -qo "$zip" -d "$FONT_DIR"
|
|
rm "$zip"
|
|
}
|
|
|
|
ensure_font "Inter" "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"
|
|
ensure_font "Plus Jakarta Sans" "https://github.com/tokotype/PlusJakartaSans/releases/download/2.7.1/PlusJakartaSans-2.7.1.zip"
|
|
|
|
# Fontconfig setup
|
|
export FONTCONFIG_FILE="$FONT_DIR/fonts.conf"
|
|
cat > "$FONT_DIR/fonts.conf" << EOF
|
|
<?xml version="1.0"?>
|
|
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
|
|
<fontconfig>
|
|
<dir>$FONT_DIR</dir>
|
|
<cachedir>$FONT_DIR/cache</cachedir>
|
|
<include ignore_missing="yes">/etc/fonts/fonts.conf</include>
|
|
</fontconfig>
|
|
EOF
|
|
mkdir -p "$FONT_DIR/cache"
|
|
fc-cache -f "$FONT_DIR" 2>/dev/null
|
|
|
|
for font in "Inter" "Plus Jakarta Sans"; do
|
|
if ! fc-list : family | grep -qi "$font"; then
|
|
echo "Error: Font '$font' not found after download" >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
mkdir -p "$OUTPUT_DIR"
|
|
echo "Building social cards..."
|
|
rsvg-convert social-card.svg -o "$OUTPUT_DIR/social-card.png"
|
|
rsvg-convert github-social-card.svg -o "$OUTPUT_DIR/github-social-card.png"
|
|
echo "Done:"
|
|
ls -lh "$OUTPUT_DIR"/*.png
|
|
|
|
bench-llm-commits:
|
|
desc: Benchmark LLM commit message tools (claude, llm, aichat, codex, opencode)
|
|
silent: true
|
|
cmds:
|
|
- |
|
|
set -euo pipefail
|
|
|
|
# Test prompts
|
|
SMALL_PROMPT=$(cat <<'EOF'
|
|
Write a commit message for the staged changes below.
|
|
|
|
<format>
|
|
- Subject under 50 chars, blank line, then optional body
|
|
- Output only the commit message, no quotes or code blocks
|
|
</format>
|
|
|
|
<diffstat>
|
|
src/config.rs | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
</diffstat>
|
|
|
|
<diff>
|
|
diff --git a/src/config.rs b/src/config.rs
|
|
@@ -10,6 +10,8 @@ pub struct Config {
|
|
pub debug: bool,
|
|
+ /// Enable verbose logging
|
|
+ pub verbose: bool,
|
|
}
|
|
</diff>
|
|
|
|
<context>
|
|
Branch: feature/logging
|
|
</context>
|
|
EOF
|
|
)
|
|
|
|
MEDIUM_PROMPT=$(cat <<'EOF'
|
|
Write a commit message for the staged changes below.
|
|
|
|
<format>
|
|
- Subject under 50 chars, blank line, then optional body
|
|
- Output only the commit message, no quotes or code blocks
|
|
</format>
|
|
|
|
<style>
|
|
- Imperative mood: "Add feature" not "Added feature"
|
|
- Match recent commit style (conventional commits if used)
|
|
</style>
|
|
|
|
<diffstat>
|
|
src/auth/jwt.rs | 45 +++++++++++++++++++++++++++++++++
|
|
src/auth/mod.rs | 2 ++
|
|
src/middleware.rs | 12 +++++++++
|
|
tests/auth_test.rs | 28 +++++++++++++++++++++
|
|
4 files changed, 87 insertions(+)
|
|
</diffstat>
|
|
|
|
<diff>
|
|
diff --git a/src/auth/jwt.rs b/src/auth/jwt.rs
|
|
new file mode 100644
|
|
+use jsonwebtoken::{encode, decode, Header, Validation};
|
|
+
|
|
+pub struct Claims { pub sub: String, pub exp: usize }
|
|
+
|
|
+pub fn create_token(user_id: &str, secret: &[u8]) -> Result<String, Error> {
|
|
+ let claims = Claims { sub: user_id.to_owned(), exp: ... };
|
|
+ encode(&Header::default(), &claims, &EncodingKey::from_secret(secret))
|
|
+}
|
|
+
|
|
+pub fn validate_token(token: &str, secret: &[u8]) -> Result<Claims, Error> {
|
|
+ decode::<Claims>(token, &DecodingKey::from_secret(secret), &Validation::default())
|
|
+}
|
|
</diff>
|
|
|
|
<context>
|
|
Branch: feature/auth
|
|
<recent_commits>
|
|
- feat(api): add user registration endpoint
|
|
- fix(db): handle connection pool exhaustion
|
|
</recent_commits>
|
|
</context>
|
|
EOF
|
|
)
|
|
|
|
# Documented commands from llm-commits.md
|
|
declare -A COMMANDS
|
|
COMMANDS["claude"]='MAX_THINKING_TOKENS=0 claude -p --no-session-persistence --model=haiku --tools='"'"''"'"' --safe-mode --setting-sources='"'"'user'"'"' --system-prompt='"'"''"'"''
|
|
COMMANDS["llm"]='llm -m claude-haiku-4.5'
|
|
COMMANDS["aichat"]='aichat -m claude:claude-haiku-4.5'
|
|
COMMANDS["codex"]='codex exec -m gpt-5.6-luna -c model_reasoning_effort='"'"'low'"'"' -c system_prompt='"'"''"'"' --sandbox=read-only --json - | jq -sr '"'"'[.[] | select(.item.type? == "agent_message")] | last.item.text'"'"''
|
|
COMMANDS["opencode"]='opencode run -m anthropic/claude-haiku-4.5 --variant fast'
|
|
|
|
# Check which tools are available
|
|
echo "=== LLM Commit Message Benchmark ==="
|
|
echo ""
|
|
echo "Checking available tools..."
|
|
AVAILABLE=()
|
|
for tool in claude llm aichat codex opencode; do
|
|
if command -v "$tool" &>/dev/null; then
|
|
echo " ✓ $tool"
|
|
AVAILABLE+=("$tool")
|
|
else
|
|
echo " ✗ $tool (not installed)"
|
|
fi
|
|
done
|
|
if command -v jq &>/dev/null; then
|
|
echo " ✓ jq (required for codex)"
|
|
else
|
|
echo " ✗ jq (required for codex)"
|
|
# Drop codex from the list. String substitution (${AVAILABLE[@]/codex})
|
|
# would rewrite the element to "" rather than remove it, leaving an
|
|
# empty tool name to iterate over later — rebuild the array instead.
|
|
FILTERED=()
|
|
for tool in "${AVAILABLE[@]}"; do
|
|
[ "$tool" = codex ] || FILTERED+=("$tool")
|
|
done
|
|
AVAILABLE=("${FILTERED[@]}")
|
|
fi
|
|
echo ""
|
|
|
|
if [ ${#AVAILABLE[@]} -eq 0 ]; then
|
|
echo "No tools available. Install at least one:"
|
|
echo " claude: https://docs.anthropic.com/en/docs/claude-code"
|
|
echo " llm: uv tool install llm llm-anthropic"
|
|
echo " aichat: https://github.com/sigoden/aichat"
|
|
echo " codex: npm install -g @openai/codex"
|
|
echo " opencode: https://opencode.ai/download"
|
|
exit 1
|
|
fi
|
|
|
|
# Benchmark function
|
|
bench() {
|
|
local name="$1"
|
|
local cmd="$2"
|
|
local prompt="$3"
|
|
local start end elapsed output first_line
|
|
|
|
start=$(date +%s)
|
|
output=$(echo "$prompt" | eval "$cmd" 2>/dev/null) || output="[error]"
|
|
end=$(date +%s)
|
|
elapsed=$((end - start))
|
|
first_line=$(echo "$output" | head -1 | cut -c1-50)
|
|
|
|
printf " %-8s %3ds %s\n" "$name:" "$elapsed" "$first_line"
|
|
}
|
|
|
|
# Run benchmarks
|
|
for size in small medium; do
|
|
if [ "$size" = "small" ]; then
|
|
PROMPT="$SMALL_PROMPT"
|
|
echo "### Small diff (add verbose flag) ###"
|
|
else
|
|
PROMPT="$MEDIUM_PROMPT"
|
|
echo "### Medium diff (JWT auth module) ###"
|
|
fi
|
|
echo ""
|
|
|
|
for tool in "${AVAILABLE[@]}"; do
|
|
bench "$tool" "${COMMANDS[$tool]}" "$PROMPT"
|
|
done
|
|
echo ""
|
|
done
|
|
|
|
echo "Commands used (from docs/content/llm-commits.md):"
|
|
for tool in "${AVAILABLE[@]}"; do
|
|
echo " $tool: ${COMMANDS[$tool]}"
|
|
done
|
|
|
|
generate-logo:
|
|
desc: Generate logo using Gemini AI
|
|
dir: "{{.REPO_ROOT}}"
|
|
preconditions:
|
|
- sh: command -v gemimg
|
|
msg: "gemimg required. Install with: uv tool install gemimg"
|
|
- sh: command -v magick
|
|
msg: "imagemagick required. Install with: brew install imagemagick"
|
|
- sh: command -v rembg
|
|
msg: "rembg required. Install with: uv tool install rembg[cli]"
|
|
- sh: test -f dev/logo-prompt.json
|
|
msg: "dev/logo-prompt.json not found"
|
|
cmds:
|
|
- |
|
|
set -euo pipefail
|
|
RAW_FILE=".tmp/logo-raw.png"
|
|
SIZE_1X=512
|
|
SIZE_2X=1024
|
|
SIZE_FAVICON=32
|
|
|
|
mkdir -p .tmp
|
|
|
|
echo "Generating logo..."
|
|
gemimg "$(cat dev/logo-prompt.json)" \
|
|
--model gemini-3-pro-image-preview \
|
|
--aspect-ratio 1:1 \
|
|
-o "$RAW_FILE"
|
|
|
|
echo "Removing background..."
|
|
rembg i "$RAW_FILE" "$RAW_FILE"
|
|
|
|
echo "Processing sizes..."
|
|
magick "$RAW_FILE" -resize "${SIZE_1X}x${SIZE_1X}" "{{.STATIC_DIR}}/logo.png"
|
|
magick "$RAW_FILE" -resize "${SIZE_2X}x${SIZE_2X}" "{{.STATIC_DIR}}/logo@2x.png"
|
|
magick "$RAW_FILE" -resize "${SIZE_FAVICON}x${SIZE_FAVICON}" "{{.STATIC_DIR}}/favicon.png"
|
|
rm "$RAW_FILE"
|
|
|
|
echo "Done. Generated:"
|
|
ls -la "{{.STATIC_DIR}}"/logo.png "{{.STATIC_DIR}}"/logo@2x.png "{{.STATIC_DIR}}"/favicon.png
|