workforest 0.2.2__tar.gz → 0.2.3__tar.gz

{workforest-0.2.2 → workforest-0.2.3}/.github/workflows/publish_aur.yml

@@ -12,7 +12,7 @@ jobs:
       name: aur
       url: https://aur.archlinux.org/packages/workforest
     permissions:
-      contents: write  # commit the generated PKGBUILD back to main
+      contents: read
     steps:
       - name: Install system dependencies
         run: >
@@ -21,15 +21,15 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Update PKGBUILD to released version
+      - name: Render PKGBUILD from template
         run: |
           version="${GITHUB_REF_NAME#v}"
           cd packaging/AUR
-          sed -i "s/^pkgver=.*/pkgver=$version/" PKGBUILD
-          sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD
+          sed "s/@VERSION@/$version/g" PKGBUILD.template > PKGBUILD
           # makepkg refuses to run as root
           useradd -m builder
           chown -R builder .
+          # updpkgsums replaces the @SHA256@ placeholder with the real checksum
           runuser -u builder -- updpkgsums
           runuser -u builder -- sh -c 'makepkg --printsrcinfo > .SRCINFO'
 
@@ -70,24 +70,3 @@ jobs:
             git commit -m "Update to $version"
             git push origin HEAD:master
           fi
-
-      - name: Commit generated PKGBUILD back to main
-        run: |
-          version="${GITHUB_REF_NAME#v}"
-          cp packaging/AUR/PKGBUILD packaging/AUR/.SRCINFO /tmp/
-          # The workspace is created by the host runner under a different UID
-          # than the container's root, so git rejects it without this.
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          # The workflow runs detached at the release tag; move to main to commit.
-          # -f discards the in-place edits we just copied to /tmp; build
-          # artifacts in packaging/AUR are untracked and never git-added.
-          git fetch origin main
-          git checkout -f -B main origin/main
-          cp /tmp/PKGBUILD /tmp/.SRCINFO packaging/AUR/
-          git add packaging/AUR/PKGBUILD packaging/AUR/.SRCINFO
-          if git diff --cached --quiet; then
-            echo "Repo copy already up to date."
-          else
-            git commit -m "Update PKGBUILD to $version"
-            git push origin main
-          fi

{workforest-0.2.2 → workforest-0.2.3}/.github/workflows/publish_homebrew.yml

@@ -3,32 +3,43 @@ name: Publish to Homebrew tap
 on:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Release version to publish (e.g. 0.2.1)"
+        required: true
 
 jobs:
   publish:
     runs-on: macos-latest
+    env:
+      RELEASE_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.version || github.ref_name }}
     environment:
       name: homebrew-tap
       url: https://github.com/ArkadyBuryakov/homebrew-tap
     permissions:
-      contents: write  # commit the generated formula back to main
+      contents: read
     steps:
       - uses: actions/checkout@v4
 
-      - name: Update formula to released version
+      - name: Render formula from template
         run: |
-          version="${GITHUB_REF_NAME#v}"
+          version="${RELEASE_VERSION#v}"
           url="https://github.com/ArkadyBuryakov/workforest/archive/v$version.tar.gz"
           curl -fsSL "$url" -o /tmp/workforest.tar.gz
           sha256=$(shasum -a 256 /tmp/workforest.tar.gz | cut -d' ' -f1)
           cd packaging/homebrew
-          sed -i '' "s|^  url .*|  url \"$url\"|" workforest.rb
-          sed -i '' "s|^  sha256 .*|  sha256 \"$sha256\"|" workforest.rb
+          sed -e "s/@VERSION@/$version/g" -e "s/@SHA256@/$sha256/g" \
+            workforest.rb.template > workforest.rb
 
       - name: Build, test, and smoke test
         run: |
-          brew install --build-from-source --formula packaging/homebrew/workforest.rb
-          brew test --formula packaging/homebrew/workforest.rb
+          # Homebrew >= 4.6.4 refuses to install from a bare file path —
+          # formulas must live in a tap, so stage ours in a throwaway one.
+          brew tap-new --no-git arkadyburyakov/test
+          cp packaging/homebrew/workforest.rb "$(brew --repository arkadyburyakov/test)/Formula/"
+          brew install --build-from-source arkadyburyakov/test/workforest
+          brew test arkadyburyakov/test/workforest
           workforest --version
           wf --version
           workforest shell-init bash | bash -n
@@ -38,7 +49,7 @@ jobs:
         env:
           TAP_SSH_PRIVATE_KEY: ${{ secrets.TAP_SSH_PRIVATE_KEY }}
         run: |
-          version="${GITHUB_REF_NAME#v}"
+          version="${RELEASE_VERSION#v}"
           # Host keys are pinned rather than keyscanned (same policy as the
           # AUR workflow); these are GitHub's published SSH fingerprints.
           mkdir -p /tmp/ssh
@@ -63,29 +74,3 @@ jobs:
             git commit -m "workforest $version"
             git push origin main
           fi
-
-      - name: Commit generated formula back to main
-        run: |
-          version="${GITHUB_REF_NAME#v}"
-          cp packaging/homebrew/workforest.rb /tmp/workforest.rb
-          git config --global user.name "Arkady Buryakov"
-          git config --global user.email "arkady@buryakov.pro"
-          # The workflow runs detached at the release tag; move to main to
-          # commit. Retry because the AUR publisher pushes to main from the
-          # same release event and the two can race.
-          for attempt in 1 2 3; do
-            git fetch origin main
-            git checkout -f -B main origin/main
-            cp /tmp/workforest.rb packaging/homebrew/workforest.rb
-            git add packaging/homebrew/workforest.rb
-            if git diff --cached --quiet; then
-              echo "Repo copy already up to date."
-              break
-            fi
-            git commit -m "Update Homebrew formula to $version"
-            if git push origin main; then
-              break
-            fi
-            echo "Push raced with another workflow, retrying ($attempt)..."
-            sleep 10
-          done

{workforest-0.2.2 → workforest-0.2.3}/.gitignore

@@ -13,9 +13,12 @@ build/
 .coverage
 htmlcov/
 
-# Packaging artifacts
+# Packaging artifacts (rendered from *.template at release time)
 *.pkg.tar.zst
 pkg/
+packaging/AUR/PKGBUILD
+packaging/AUR/.SRCINFO
+packaging/homebrew/workforest.rb
 
 # Tooling config
 .workforest.yaml

{workforest-0.2.2 → workforest-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: workforest
-Version: 0.2.2
+Version: 0.2.3
 Summary: Git worktree forest management: create, open, and clean up per-branch worktrees with project-defined setup hooks
 Project-URL: Homepage, https://github.com/ArkadyBuryakov/workforest
 Author-email: Arkady Buryakov <arkady@buryakov.pro>
@@ -136,7 +136,9 @@ word-splits into multiple arguments, while `{x}` — `{worktree}`, `{target}`,
 Openers run with the worktree root as working directory; in
 `window_command` the resolved opener command is additionally available as
 `$WF_COMMAND` (spliced into argv words) or `{command}` (one argument, for
-`$SHELL -c` wrappers).
+`$SHELL -c` wrappers). Spawned windows shed activation state inherited from
+the invoking shell (Python venv, conda, nvm, rvm) so the new session starts
+clean instead of carrying an environment it cannot deactivate.
 
 Fully commented reference configs:
 [`config.yaml`](src/workforest/examples/config.yaml) (user/system) and
@@ -200,12 +202,13 @@ make install      # install this checkout as a uv tool (~/.local/bin/workforest)
 make uninstall    # remove it again
 ```
 
-Packaging recipes live under `packaging/` (one directory per package
-manager: `packaging/AUR/`, `packaging/homebrew/`).
-Release: bump `__version__` and push to main — CI tags the release and
-publishes to PyPI, the AUR, and the
-[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap), committing
-the regenerated recipes back to the repo.
+Packaging templates live under `packaging/` (one directory per package
+manager: `packaging/AUR/`, `packaging/homebrew/`); the `@VERSION@` and
+`@SHA256@` placeholders are filled in at release time.
+Release: bump `__version__` and push to main — CI tags the release,
+renders the templates, and publishes to PyPI, the AUR, and the
+[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap). The
+published AUR package and tap are the only places rendered recipes exist.
 
 ## License
 

{workforest-0.2.2 → workforest-0.2.3}/README.md

@@ -116,7 +116,9 @@ word-splits into multiple arguments, while `{x}` — `{worktree}`, `{target}`,
 Openers run with the worktree root as working directory; in
 `window_command` the resolved opener command is additionally available as
 `$WF_COMMAND` (spliced into argv words) or `{command}` (one argument, for
-`$SHELL -c` wrappers).
+`$SHELL -c` wrappers). Spawned windows shed activation state inherited from
+the invoking shell (Python venv, conda, nvm, rvm) so the new session starts
+clean instead of carrying an environment it cannot deactivate.
 
 Fully commented reference configs:
 [`config.yaml`](src/workforest/examples/config.yaml) (user/system) and
@@ -180,12 +182,13 @@ make install      # install this checkout as a uv tool (~/.local/bin/workforest)
 make uninstall    # remove it again
 ```
 
-Packaging recipes live under `packaging/` (one directory per package
-manager: `packaging/AUR/`, `packaging/homebrew/`).
-Release: bump `__version__` and push to main — CI tags the release and
-publishes to PyPI, the AUR, and the
-[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap), committing
-the regenerated recipes back to the repo.
+Packaging templates live under `packaging/` (one directory per package
+manager: `packaging/AUR/`, `packaging/homebrew/`); the `@VERSION@` and
+`@SHA256@` placeholders are filled in at release time.
+Release: bump `__version__` and push to main — CI tags the release,
+renders the templates, and publishes to PyPI, the AUR, and the
+[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap). The
+published AUR package and tap are the only places rendered recipes exist.
 
 ## License
 

workforest-0.2.2/packaging/AUR/PKGBUILD → workforest-0.2.3/packaging/AUR/PKGBUILD.template

@@ -1,6 +1,10 @@
 # Maintainer: Arkady Buryakov <arkady@buryakov.pro>
+#
+# Template — not a buildable PKGBUILD. On release the publish_aur workflow
+# substitutes @VERSION@, fills sha256sums via updpkgsums, generates .SRCINFO,
+# and pushes the rendered files to the AUR; nothing is committed back here.
 pkgname=workforest
-pkgver=0.2.1
+pkgver=@VERSION@
 pkgrel=1
 pkgdesc="Git worktree forest management: per-branch worktrees with project-defined setup hooks"
 arch=(any)
@@ -10,7 +14,7 @@ depends=(python python-yaml git)
 makedepends=(python-build python-installer python-wheel python-hatchling)
 optdepends=('fzf: interactive TUI (workforest tui)')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078')
+sha256sums=('@SHA256@')
 
 build() {
   cd "$pkgname-$pkgver"

workforest-0.2.2/packaging/homebrew/workforest.rb → workforest-0.2.3/packaging/homebrew/workforest.rb.template

@@ -1,13 +1,15 @@
-# The publish_homebrew workflow rewrites url/sha256 on release and pushes
-# this file to the ArkadyBuryakov/homebrew-tap repo; this copy is the source
-# of truth for everything else (deps, completions, caveats, test).
+# Template — not an installable formula. On release the publish_homebrew
+# workflow substitutes @VERSION@ and @SHA256@ and pushes the rendered
+# Formula/workforest.rb to the ArkadyBuryakov/homebrew-tap repo; nothing is
+# committed back here. This copy is the source of truth for everything else
+# (deps, completions, caveats, test).
 class Workforest < Formula
   include Language::Python::Virtualenv
 
   desc "Git worktree forest management with per-branch setup hooks"
   homepage "https://github.com/ArkadyBuryakov/workforest"
-  url "https://github.com/ArkadyBuryakov/workforest/archive/v0.2.1.tar.gz"
-  sha256 "47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078"
+  url "https://github.com/ArkadyBuryakov/workforest/archive/v@VERSION@.tar.gz"
+  sha256 "@SHA256@"
   license "MIT"
   head "https://github.com/ArkadyBuryakov/workforest.git", branch: "main"
 

{workforest-0.2.2 → workforest-0.2.3}/src/workforest/__init__.py

@@ -1,3 +1,3 @@
 """Workforest — git worktree forest management."""
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"

{workforest-0.2.2 → workforest-0.2.3}/src/workforest/launch.py

@@ -26,6 +26,19 @@ from workforest.errors import WorkforestError
 
 _PLACEHOLDER = re.compile(r"\{([a-z_]+)\}")
 
+# Shell-session activation state that must not leak into a spawned window:
+# (prefix variable, bin subdirs under it that activation put on PATH,
+# companion variables set alongside it). An empty subdir means the prefix
+# variable is itself the PATH entry.
+_ACTIVATION_STATE: tuple[tuple[str, tuple[str, ...], tuple[str, ...]], ...] = (
+    ("VIRTUAL_ENV", ("bin", "Scripts"), ("VIRTUAL_ENV_PROMPT",)),
+    ("CONDA_PREFIX", ("bin",), ("CONDA_DEFAULT_ENV", "CONDA_PROMPT_MODIFIER", "CONDA_SHLVL")),
+    ("NVM_BIN", ("",), ("NVM_INC",)),
+    ("GEM_HOME", ("bin",), ("GEM_PATH",)),
+    ("MY_RUBY_HOME", ("bin",), ("RUBY_VERSION",)),
+)
+_CONDA_STACK = re.compile(r"CONDA_PREFIX_\d+")
+
 
 @dataclass(slots=True, frozen=True)
 class ShellAction:
@@ -131,6 +144,34 @@ def launch(
     return ShellAction(f"cd {shlex.quote(str(worktree))} && {assignments} {command}")
 
 
+def scrub_activation_state(env: dict[str, str]) -> dict[str, str]:
+    """Drop venv/conda/nvm/rvm activation inherited from the invoking shell.
+
+    A spawned window is a fresh context: the tools' `deactivate` counterparts
+    are shell functions that don't exist there, so inherited activation is
+    unremovable and points at the wrong worktree's environment. Prompt-hook
+    managers (direnv, mise, asdf) re-derive their state in the new shell and
+    need no help; nix-shell is left alone because on NixOS its PATH entries
+    are indistinguishable from the system PATH.
+    """
+    env = dict(env)
+    stale_dirs: set[str] = set()
+    for var, subdirs, companions in _ACTIVATION_STATE:
+        prefix = env.pop(var, None)
+        for name in companions:
+            env.pop(name, None)
+        if prefix:
+            stale_dirs.update(str(Path(prefix) / sub) if sub else prefix for sub in subdirs)
+    for var in [name for name in env if _CONDA_STACK.fullmatch(name)]:
+        stale_dirs.add(str(Path(env.pop(var)) / "bin"))
+    path = env.get("PATH")
+    if path and stale_dirs:
+        env["PATH"] = os.pathsep.join(
+            entry for entry in path.split(os.pathsep) if entry not in stale_dirs
+        )
+    return env
+
+
 def spawn_window(
     window_template: str,
     *,
@@ -142,7 +183,8 @@ def spawn_window(
 
     The resolved opener command joins the family as {command} (one argument,
     e.g. for `$SHELL -c {command}`) / `$WF_COMMAND` (spliced into argv words);
-    it is template-only and not exported to the environment.
+    it is template-only and not exported to the environment. The inherited
+    environment is passed through scrub_activation_state first.
     """
     expanded = expand_template(window_template, {**variables, "WF_COMMAND": command})
     argv = shlex.split(expanded)
@@ -152,7 +194,7 @@ def spawn_window(
         subprocess.Popen(
             argv,
             cwd=cwd,
-            env={**os.environ, **variables},
+            env=scrub_activation_state({**os.environ, **variables}),
             start_new_session=True,
             stdin=subprocess.DEVNULL,
             stdout=subprocess.DEVNULL,

{workforest-0.2.2 → workforest-0.2.3}/tests/conftest.py

@@ -150,7 +150,8 @@ def recorder(tmp_path: Path) -> Recorder:
     log = tmp_path / "recorder.log"
     script = tmp_path / "recorder"
     script.write_text(
-        f'#!/bin/sh\necho "argv=$* argc=$# cwd=$PWD wf_worktree=$WF_WORKTREE" >> {log}\n'
+        f'#!/bin/sh\necho "argv=$* argc=$# cwd=$PWD wf_worktree=$WF_WORKTREE'
+        f' virtual_env=$VIRTUAL_ENV" >> {log}\n'
     )
     script.chmod(script.stat().st_mode | stat.S_IXUSR)
     return Recorder(path=script, log=log)

{workforest-0.2.2 → workforest-0.2.3}/tests/test_launch.py

@@ -1,5 +1,6 @@
 """launch: opener/window template resolution and the cd protocol."""
 
+import os
 import shlex
 from pathlib import Path
 
@@ -101,6 +102,61 @@ class TestTemplateExpansion:
         )
 
 
+class TestScrubActivationState:
+    def test_venv_vars_and_path_entry_removed(self) -> None:
+        env = {
+            "VIRTUAL_ENV": "/repo/.venv",
+            "VIRTUAL_ENV_PROMPT": "(.venv)",
+            "PATH": "/repo/.venv/bin:/usr/local/bin:/usr/bin",
+            "HOME": "/home/u",
+        }
+        assert launch.scrub_activation_state(env) == {
+            "PATH": "/usr/local/bin:/usr/bin",
+            "HOME": "/home/u",
+        }
+
+    def test_clean_environment_untouched(self) -> None:
+        env = {"PATH": "/usr/local/bin:/usr/bin", "HOME": "/home/u", "WF_BRANCH": "feat"}
+        assert launch.scrub_activation_state(env) == env
+
+    def test_conda_including_stacked_prefixes(self) -> None:
+        env = {
+            "CONDA_PREFIX": "/opt/conda/envs/proj",
+            "CONDA_PREFIX_1": "/opt/conda",
+            "CONDA_DEFAULT_ENV": "proj",
+            "CONDA_SHLVL": "2",
+            "CONDA_PROMPT_MODIFIER": "(proj) ",
+            "PATH": "/opt/conda/envs/proj/bin:/opt/conda/bin:/opt/conda/condabin:/usr/bin",
+        }
+        # condabin survives so `conda` itself keeps working in the window.
+        assert launch.scrub_activation_state(env) == {
+            "PATH": "/opt/conda/condabin:/usr/bin",
+        }
+
+    def test_nvm_bin_is_itself_the_path_entry(self) -> None:
+        env = {
+            "NVM_BIN": "/home/u/.nvm/versions/node/v22.0.0/bin",
+            "NVM_INC": "/home/u/.nvm/versions/node/v22.0.0/include/node",
+            "PATH": "/home/u/.nvm/versions/node/v22.0.0/bin:/usr/bin",
+        }
+        assert launch.scrub_activation_state(env) == {"PATH": "/usr/bin"}
+
+    def test_rvm_ruby(self) -> None:
+        env = {
+            "GEM_HOME": "/home/u/.rvm/gems/ruby-3.3.0",
+            "GEM_PATH": "/home/u/.rvm/gems/ruby-3.3.0:/home/u/.rvm/gems/ruby-3.3.0@global",
+            "MY_RUBY_HOME": "/home/u/.rvm/rubies/ruby-3.3.0",
+            "RUBY_VERSION": "ruby-3.3.0",
+            "PATH": (
+                "/home/u/.rvm/gems/ruby-3.3.0/bin:/home/u/.rvm/rubies/ruby-3.3.0/bin:/usr/bin"
+            ),
+        }
+        assert launch.scrub_activation_state(env) == {"PATH": "/usr/bin"}
+
+    def test_missing_path_is_fine(self) -> None:
+        assert launch.scrub_activation_state({"VIRTUAL_ENV": "/repo/.venv"}) == {}
+
+
 def run_launch(
     cfg: Config,
     tmp_path: Path,
@@ -186,6 +242,16 @@ class TestLaunch:
         (line,) = recorder.wait_for_lines(1)
         assert f"wf_worktree={worktree}" in line
 
+    def test_window_process_sheds_inherited_venv(
+        self, tmp_path: Path, recorder: Recorder, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("VIRTUAL_ENV", str(tmp_path / ".venv"))
+        monkeypatch.setenv("PATH", f"{tmp_path / '.venv' / 'bin'}:{os.environ['PATH']}")
+        cfg = Config(window_command=f"{recorder.path} $WF_COMMAND")
+        run_launch(cfg, tmp_path, opener_arg="x")
+        (line,) = recorder.wait_for_lines(1)
+        assert line.endswith("virtual_env=")
+
     def test_empty_window_command_after_expansion(
         self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
     ) -> None:

workforest-0.2.2/packaging/AUR/.SRCINFO

@@ -1,19 +0,0 @@
-pkgbase = workforest
-	pkgdesc = Git worktree forest management: per-branch worktrees with project-defined setup hooks
-	pkgver = 0.2.1
-	pkgrel = 1
-	url = https://github.com/ArkadyBuryakov/workforest
-	arch = any
-	license = MIT
-	makedepends = python-build
-	makedepends = python-installer
-	makedepends = python-wheel
-	makedepends = python-hatchling
-	depends = python
-	depends = python-yaml
-	depends = git
-	optdepends = fzf: interactive TUI (workforest tui)
-	source = workforest-0.2.1.tar.gz::https://github.com/ArkadyBuryakov/workforest/archive/v0.2.1.tar.gz
-	sha256sums = 47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078
-
-pkgname = workforest