diff --git a/Cargo.lock b/Cargo.lock index b2169aa..f167a04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1563,7 +1563,7 @@ dependencies = [ [[package]] name = "worklane" -version = "0.33.10" +version = "0.33.11" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index aaa68dc..a3153d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "worklane" -version = "0.33.10" +version = "0.33.11" edition = "2024" [dependencies] diff --git a/Makefile b/Makefile index a3816fd..25de31f 100644 --- a/Makefile +++ b/Makefile @@ -56,15 +56,24 @@ patch minor major: release # A release rewrites the last commit, so refuse anything that would make that # rewrite lose work or orphan a tag. +# +# Untracked character devices are not work: an agent sandbox bind-mounts /dev/null over +# protected paths such as .bashrc, and git cannot commit a device anyway. Untracked files +# are listed one by one, not with --directory, because the sandbox also mounts devices +# inside an untracked .claude/, and a collapsed directory entry is never a device. release: @set -e; \ if ! git rev-parse -q --verify HEAD >/dev/null 2>&1; then \ echo "error: no commits yet, so there is no commit to fold a version bump into. Commit first." >&2; \ exit 1; \ fi; \ - if [ -n "$$(git status --porcelain)" ]; then \ + dirty=$$( { git status --porcelain --untracked-files=no; \ + git ls-files --others --exclude-standard | while IFS= read -r f; do \ + [ -c "$$f" ] || echo "?? $$f"; \ + done; } ); \ + if [ -n "$$dirty" ]; then \ echo "error: working tree is dirty. Commit or stash first, and decide whether that work belongs in this version:" >&2; \ - git status --short >&2; \ + echo "$$dirty" >&2; \ exit 1; \ fi; \ if [ -n "$$(git tag --points-at HEAD)" ]; then \ diff --git a/docs/releasing.md b/docs/releasing.md index ec516a9..81468bf 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -11,6 +11,7 @@ The commit convention and the version bump that goes with it. - Before every commit, decide whether the change warrants a version bump in `Cargo.toml` - Always ask the user to confirm the bump and its kind before making it — never bump silently, and never skip the question because the answer looks obvious - **`make patch`, `make minor` and `make major` do the mechanics**, run after the commit is in: each bumps `Cargo.toml` and the `worklane` entry in `Cargo.lock`, appends `, and bump to ` to the commit's subject, folds the bump into that commit, and tags it. Bumping by hand is how a version comes to be left untagged, which is what the one action is for. It refuses on a dirty tree, on an already-tagged `HEAD` and on a `HEAD` that is already pushed, since each of those makes the amend lose work, orphan a tag or need a force push +- **Untracked character devices do not make the tree dirty.** An agent sandbox bind-mounts `/dev/null` over protected paths such as `.bashrc`, `.gitconfig` and files inside `.claude/`, so git sees untracked entries that do not exist outside the sandbox, and `make patch` refused a clean tree. A device cannot be committed, so the check skips them. Untracked files are listed one by one rather than with `--directory`: the collapsed `.claude/` entry is a directory, not a device, and kept the refusal alive - Pre-1.0, so: patch for fixes and internal changes, minor for a new command, flag or changed output, major only for a deliberate 1.0 - **Changed output means the CLI's output.** That is the surface scripts and agents read, so a changed listing, message or exit code is a minor. A change to what the board draws is a patch however visible it is, since nothing consumes the frame. See [The Board View](tui-board.md) - **Settling output that shipped one version ago is a patch**, not a second minor. 0.15.1 changed the relation mark 0.15.0 had just introduced, and 0.15.2 added the status mark beside it: the minor was the arrival of a marked relations block, and settling what it marks belongs to that. Three minors in an hour would tell anyone reading the tags that there were three features