From f61f623b5b7116ba7f969d6fd224b4bf02fdb615 Mon Sep 17 00:00:00 2001
From: Developer <developer@example.com>
Date: Wed, 25 Jun 2025 00:51:17 +0100
Subject: [PATCH 1/5] fix(poetry-env): handle in-project virtual environments
 when path returns "."

When Poetry is configured with virtualenvs.in-project = true,
poetry env info --path returns "." instead of the full path.
This causes the plugin to fail with "no such file or directory: ./bin/activate".

Changes:
- Handle case where poetry returns "." by converting to $PWD/.venv
- Add safety check to ensure activate script exists before sourcing
- Maintain backward compatibility with existing setups

Fixes issue with in-project virtual environments used in monorepos and git worktrees.
---
 plugins/poetry-env/poetry-env.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/poetry-env/poetry-env.plugin.zsh b/plugins/poetry-env/poetry-env.plugin.zsh
index dca388dfe..6fff2148b 100644
--- a/plugins/poetry-env/poetry-env.plugin.zsh
+++ b/plugins/poetry-env/poetry-env.plugin.zsh
@@ -15,7 +15,12 @@ _togglePoetryShell() {
   # Activate the environment if in a Poetry directory and no environment is currently active
   if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
     venv_dir=$(poetry env info --path 2>/dev/null)
-    if [[ -n "$venv_dir" ]]; then
+    # Handle case where poetry returns "." for in-project virtual environments
+    if [[ "$venv_dir" == "." ]]; then
+      venv_dir="$PWD/.venv"
+    fi
+    # Only proceed if venv_dir is set and the activate script exists
+    if [[ -n "$venv_dir" && -f "${venv_dir}/bin/activate" ]]; then
       export poetry_active=1
       export poetry_dir="$PWD"
       source "${venv_dir}/bin/activate"

From dd9e36f3ced8baea9726c0c1209e6e36b70aae7b Mon Sep 17 00:00:00 2001
From: Stephan Schielke <schielke@mykolab.ch>
Date: Sat, 31 Jan 2026 14:10:29 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20Rename=20grep.zsh?=
 =?UTF-8?q?=20to=20.no=20for=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/{grep.zsh => grep.zsh.no} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{grep.zsh => grep.zsh.no} (100%)

diff --git a/lib/grep.zsh b/lib/grep.zsh.no
similarity index 100%
rename from lib/grep.zsh
rename to lib/grep.zsh.no

From b9288d65e30ae61975d59f8439dcce98010597d6 Mon Sep 17 00:00:00 2001
From: Stephan Schielke <schielke@mykolab.ch>
Date: Tue, 10 Mar 2026 11:31:31 +0000
Subject: [PATCH 3/5] =?UTF-8?q?=E2=9C=A8=20feat:=20Ignore=20Stakpak=20sess?=
 =?UTF-8?q?ion=20files=20in=20.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added `.stakpak/session*` to ignore Stakpak session files
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index a53da3b3e..18d7e72d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ log/
 
 # zcompile cached files
 *.zwc
+
+# Stakpak session files
+.stakpak/session*

From 1c966955eccebcad84e5b57da0ac5ddf93e7df78 Mon Sep 17 00:00:00 2001
From: Stephan Schielke <schielke@mykolab.ch>
Date: Mon, 30 Mar 2026 23:45:38 +0100
Subject: [PATCH 4/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20Rename=20`?=
 =?UTF-8?q?grep.zsh.no`=20back=20to=20`grep.zsh`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/{grep.zsh.no => grep.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{grep.zsh.no => grep.zsh} (100%)

diff --git a/lib/grep.zsh.no b/lib/grep.zsh
similarity index 100%
rename from lib/grep.zsh.no
rename to lib/grep.zsh

From 5eb59aab8d28a144170f343f96aafa695351f95c Mon Sep 17 00:00:00 2001
From: Stephan Schielke <schielke@mykolab.ch>
Date: Mon, 30 Mar 2026 23:48:37 +0100
Subject: [PATCH 5/5] =?UTF-8?q?Revert=20"=E2=9C=A8=20feat:=20Ignore=20Stak?=
 =?UTF-8?q?pak=20session=20files=20in=20.gitignore"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b9288d65e30ae61975d59f8439dcce98010597d6.

# Conflicts:
#	.gitignore
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 72574bf79..145ae9c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,3 @@ log/
 # zcompile cached files
 *.zwc
 *.zwc.old
-
-# Stakpak session files
-.stakpak/session*