Skip to content

[pull] main from vercel:main#325

Merged
pull[bot] merged 3 commits into
erickirt:mainfrom
vercel:main
May 5, 2026
Merged

[pull] main from vercel:main#325
pull[bot] merged 3 commits into
erickirt:mainfrom
vercel:main

Conversation

@pull

@pull pull Bot commented May 5, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

VaguelySerious and others added 3 commits May 5, 2026 00:47
* [e2e] Add step-vs-sleep race tests + dev-tmux skill

Adds two race workflows (sleepWinsRaceWorkflow, stepWinsRaceWorkflow)
that exercise Promise.race between a step function and a sleep call.
The current `sleepWinsRaceWorkflow` test fails — surfacing how the
replay engine resolves a previously-completed step instantly while
sleep still has to elapse.

Also adds a `dev-tmux` skill that documents the 3-pane tmux + portless
setup for testing workflows interactively in a worktree alongside the
observability UI.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [workbench/nextjs-turbopack] Allow *.turbopack.localhost in dev

Adds allowedDevOrigins entries so portless-style worktree-prefixed
.localhost URLs (e.g. https://<branch>.turbopack.localhost) can hit
HMR and dev-only endpoints without Next's cross-origin protection
flooding the logs with warnings.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* Drop duplicate race workflows after merging main

PR #1924 added the same sleep/step race workflows directly to main
while this branch was open. The textual concat from `git merge`
left both copies in 99_e2e.ts; this drops the duplicate set so the
file matches origin/main verbatim and the e2e tests pick up the
upstream definitions.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] Narrow activation, robust pane IDs, statusline helper

- Tighten activation phrases so the skill only fires for the specific
  portless+tmux setup it documents, not the generic "start the dev
  server" task. Addresses #1916 review.
- Capture pane IDs at split time (-P -F '#{pane_id}') so the snippet
  works under both pane-base-index 0 and 1. Addresses Copilot review.
- Add `statusline.sh` that filters `portless list` to the current
  worktree's routes and emits a one-line summary, plus instructions
  for wiring it into Claude Code's `statusLine.command`.
- Bump version to 1.1.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] Recommend primary-checkout path for statusline

Worktrees get deleted, so wiring the statusline to a worktree path
breaks the moment the worktree is removed. Update the skill and the
script header to recommend pointing `statusLine.command` at the
primary checkout (`$HOME/github/vercel/workflow/...`). The script
itself is already worktree-aware via Claude's `workspace.current_dir`
stdin JSON, so the same invocation surfaces routes for whichever
worktree the session is in.

Bump version to 1.2.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] OSC 8 link statusline + worktree-named tmux session

- Statusline overlay now renders `[dev]  ·  [obs]  ·  tmux:<prefix>`,
  with the bracketed labels emitted as OSC 8 hyperlinks (clickable in
  any modern terminal) styled cyan + underline so they stand out.
  Replaces the old long-URL form that was hard to scan and click.
- Add a tmux-session indicator: shown when a session named exactly the
  worktree prefix exists (uses `tmux has-session -t =<prefix>` for
  exact matching).
- Change the skill's tmux session naming convention from the fixed
  `workflow-dev` to `<worktree-prefix>` (basename of the branch — same
  string portless uses as the subdomain prefix). This lets the
  statusline locate the session deterministically and lets multiple
  worktrees run dev sessions concurrently without manual disambiguation.
- Bump skill to v1.3.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] Statusline: print full `tmux attach -t <name>` command

Replaces the abbreviated `tmux:<prefix>` indicator with the full
copy-paste-ready `tmux attach -t <prefix>` invocation. Saves a step
when grabbing the session from another shell.

Bump skill to v1.4.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] Brighter statusline + Nerd Font icons

- Drop the dim styling that made the overlay hard to read; use bold
  bright cyan + underline for links and bold bright green for the
  tmux command.
- Add Nerd Font glyphs:  for dev,  for obs,  for the
  tmux copy-paste hint. Falls back to box-drawing if the font lacks
  Nerd Font ranges; layout is unaffected.
- Visual differentiation: cyan + underline = clickable hyperlink;
  green = copy this command.

Bump skill to v1.5.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/dev-tmux] Restore Nerd Font icons via Unicode escapes

The copy glyph in `emit_tmux` was a literal Nerd Font byte embedded in
the printf string and got stripped during a prior rewrite. Promote all
three icons (rocket / graph / copy) to top-level shell variables that
use \uHHHH-equivalent UTF-8 escapes, so the source survives editor
round-trips that don't preserve Private Use Area code points.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* [skills/internal-dev-workbench] Rename from dev-tmux, set author + reset version

- Rename `skills/dev-tmux/` → `skills/internal-dev-workbench/` to make
  the name self-explanatory about the skill's scope (an internal
  contributor's local dev workbench, not a generic tmux helper).
- Author: Pranay Prakash. Version: 0.1 (first release of the skill).
- Update internal references in SKILL.md and statusline.sh accordingly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@pull pull Bot locked and limited conversation to collaborators May 5, 2026
@pull pull Bot added the ⤵️ pull label May 5, 2026
@pull
pull Bot merged commit ab639a1 into erickirt:main May 5, 2026
9 of 13 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants