Attempt at fixing gh-lazy current repo handling

Author: gizmo385

gh-lazy

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
+export LAZY_GITHUB_ORIGINAL_PWD="$PWD"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd "$SCRIPT_DIR"
-exec "${SCRIPT_DIR}/start.sh"
+exec "${SCRIPT_DIR}/start.sh" "$@"

lazy_github/lib/git_cli.py

@@ -1,3 +1,4 @@
+import os
 import re
 from subprocess import DEVNULL, PIPE, SubprocessError, check_output, run
 
@@ -21,7 +22,13 @@
 def current_local_repo_full_name(remote: str = "origin") -> str | None:
     """Returns the owner/name associated with the remote of the git repo in the current working directory."""
     try:
-        output = check_output(["git", "remote", "get-url", remote], stderr=DEVNULL).decode().strip()
+        # Check if we have an original working directory from GitHub CLI extension
+        original_pwd = os.environ.get("LAZY_GITHUB_ORIGINAL_PWD")
+        cmd = ["git", "remote", "get-url", remote]
+        if original_pwd:
+            cmd = ["git", "-C", original_pwd, "remote", "get-url", remote]
+        
+        output = check_output(cmd, stderr=DEVNULL).decode().strip()
     except SubprocessError:
         return None
 
@@ -43,15 +50,27 @@ def current_local_repo_matches_selected_repo(remote: str = "origin") -> bool:
 def current_local_branch_name() -> str | None:
     """Returns the name of the current branch for the git repo in the current working directory."""
     try:
-        return check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], stderr=DEVNULL).decode().strip()
+        # Check if we have an original working directory from GitHub CLI extension
+        original_pwd = os.environ.get("LAZY_GITHUB_ORIGINAL_PWD")
+        cmd = ["git", "rev-parse", "--abbrev-ref", "HEAD"]
+        if original_pwd:
+            cmd = ["git", "-C", original_pwd, "rev-parse", "--abbrev-ref", "HEAD"]
+        
+        return check_output(cmd, stderr=DEVNULL).decode().strip()
     except SubprocessError:
         return None
 
 
 def current_local_commit() -> str | None:
     """Returns the commit sha for the git repo in the current working directory"""
     try:
-        return check_output(["git", "rev-parse", "HEAD"], stderr=DEVNULL).decode().strip()
+        # Check if we have an original working directory from GitHub CLI extension
+        original_pwd = os.environ.get("LAZY_GITHUB_ORIGINAL_PWD")
+        cmd = ["git", "rev-parse", "HEAD"]
+        if original_pwd:
+            cmd = ["git", "-C", original_pwd, "rev-parse", "HEAD"]
+        
+        return check_output(cmd, stderr=DEVNULL).decode().strip()
     except SubprocessError:
         return None
 

start.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR"
 uv sync --quiet --frozen
-TERM=xterm-256color .venv/bin/python -m lazy_github -- "$@"
+TERM=xterm-256color .venv/bin/python -m lazy_github "$@"