Skip to content

Fix Time Travel stale index.lock cleanup and await progress updates #1612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zayzay109 wants to merge 1 commit into
base: main
Choose a base branch
from
+72 −45
Open

Fix Time Travel stale index.lock cleanup and await progress updates #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/_code_execution/tools/code_execution_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ async def get_terminal_output(
if partial_output:
PrintStyle(font_color="#85C1E9").stream(partial_output)
truncated_output = self.fix_full_output(full_output)
self.set_progress(truncated_output)
await self.set_progress(truncated_output)
heading = self.get_heading_from_output(truncated_output, 0)
self.log.update(content=prefix + truncated_output, heading=heading)
last_output_time = now
Expand Down Expand Up @@ -397,7 +397,7 @@ async def handle_running_session(
return None
raise
truncated_output = self.fix_full_output(full_output)
self.set_progress(truncated_output)
await self.set_progress(truncated_output)
heading = self.get_heading_from_output(truncated_output, 0)

last_lines = (
Expand Down
113 changes: 70 additions & 43 deletions plugins/_time_travel/helpers/time_travel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,17 +1104,36 @@ def _git_env(self) -> dict[str, str]:
env["GIT_OPTIONAL_LOCKS"] = "0"
return env

def _cleanup_git_index_lock(self) -> None:
"""Remove a stale Git index lock after a killed Git subprocess.

subprocess timeouts terminate Git before it can always release
repo.git/index.lock. Leaving that lock in place poisons all later
snapshot attempts for the workspace, so cleanup is best-effort and
intentionally preserves the original timeout/error path.
"""
lock_path = self.workspace.repo_git_path / "index.lock"
try:
if lock_path.exists():
lock_path.unlink()
except OSError:
pass

def _run_git_dir(self, *args: str, check: bool = False) -> subprocess.CompletedProcess[str]:
return subprocess.run(
["git", f"--git-dir={self.workspace.repo_git_path}", *args],
capture_output=True,
text=True,
encoding="utf-8",
errors="replace",
env=self._git_env(),
timeout=GIT_TIMEOUT_SECONDS,
check=check,
)
try:
return subprocess.run(
["git", f"--git-dir={self.workspace.repo_git_path}", *args],
capture_output=True,
text=True,
encoding="utf-8",
errors="replace",
env=self._git_env(),
timeout=GIT_TIMEOUT_SECONDS,
check=check,
)
except subprocess.TimeoutExpired:
self._cleanup_git_index_lock()
raise

def _shadow_repo_valid(self) -> bool:
if not self.workspace.repo_git_path.is_dir():
Expand Down Expand Up @@ -1202,24 +1221,28 @@ def _ensure_current_head_ref(self) -> None:

def _git(self, *args: str, input: str | None = None, env: dict[str, str] | None = None, check: bool = True) -> subprocess.CompletedProcess[str]:
self.workspace.shadow_path.mkdir(parents=True, exist_ok=True)
completed = subprocess.run(
[
"git",
f"--git-dir={self.workspace.repo_git_path}",
f"--work-tree={self.workspace.real_path}",
"-c",
"core.bare=false",
*args,
],
input=input,
capture_output=True,
text=True,
encoding="utf-8",
errors="replace",
env=env or self._git_env(),
cwd=str(self.workspace.real_path) if self.workspace.real_path.exists() else None,
timeout=GIT_TIMEOUT_SECONDS,
)
try:
completed = subprocess.run(
[
"git",
f"--git-dir={self.workspace.repo_git_path}",
f"--work-tree={self.workspace.real_path}",
"-c",
"core.bare=false",
*args,
],
input=input,
capture_output=True,
text=True,
encoding="utf-8",
errors="replace",
env=env or self._git_env(),
cwd=str(self.workspace.real_path) if self.workspace.real_path.exists() else None,
timeout=GIT_TIMEOUT_SECONDS,
)
except subprocess.TimeoutExpired:
self._cleanup_git_index_lock()
raise
if check and completed.returncode != 0:
raise GitCommandError(
(completed.stderr or completed.stdout or "Git command failed.").strip(),
Expand All @@ -1230,21 +1253,25 @@ def _git(self, *args: str, input: str | None = None, env: dict[str, str] | None

def _git_bytes(self, *args: str, input: bytes | None = None, check: bool = True) -> subprocess.CompletedProcess[bytes]:
self.workspace.shadow_path.mkdir(parents=True, exist_ok=True)
completed = subprocess.run(
[
"git",
f"--git-dir={self.workspace.repo_git_path}",
f"--work-tree={self.workspace.real_path}",
"-c",
"core.bare=false",
*args,
],
input=input,
capture_output=True,
env=self._git_env(),
cwd=str(self.workspace.real_path) if self.workspace.real_path.exists() else None,
timeout=GIT_TIMEOUT_SECONDS,
)
try:
completed = subprocess.run(
[
"git",
f"--git-dir={self.workspace.repo_git_path}",
f"--work-tree={self.workspace.real_path}",
"-c",
"core.bare=false",
*args,
],
input=input,
capture_output=True,
env=self._git_env(),
cwd=str(self.workspace.real_path) if self.workspace.real_path.exists() else None,
timeout=GIT_TIMEOUT_SECONDS,
)
except subprocess.TimeoutExpired:
self._cleanup_git_index_lock()
raise
if check and completed.returncode != 0:
stderr = completed.stderr.decode("utf-8", errors="replace")
stdout = completed.stdout.decode("utf-8", errors="replace")
Expand Down