WEBDIENSTE/openswarm
1
0
Fork 0
mirror of https://github.com/openswarm-ai/openswarm.git synced 2026-09-30 05:24:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

[eric] agents: FIX latent NameError on cwd sessions (ensure_cwd_git_repo import mismatch) + clean workspace_git + regression test

Browse Source
This commit is contained in:
ciregenz
2026-06-23 11:55:39 -07:00
parent 68beb599c9
commit 75db4d7ded
4 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/apps/agents/manager/session/workspace_git.py
+29 -24
View File
@@ -1,10 +1,14 @@
import logging
import os
from typing import Optional, Tuple
from typeguard import typechecked
logger = logging.getLogger(__name__)
def _ensure_cwd_git_repo(cwd: str, home: str | None = None) -> None:
@typechecked
def ensure_cwd_git_repo(cwd: str, home: Optional[str] = None) -> None:
"""Idempotently make `cwd` into a git repo with a valid HEAD.
The CLI's built-in Agent tool uses `isolation: "worktree"` to spawn
@@ -31,35 +35,35 @@ def _ensure_cwd_git_repo(cwd: str, home: str | None = None) -> None:
if not os.path.isdir(cwd):
return
import subprocess as _sp_git
import subprocess as sp_git
# Case A: cwd is inside some git repo (possibly parent). Verify
# HEAD resolves. If the enclosing repo is broken (e.g. a stray
# `.git` in $HOME with no commits, which makes workspaces
# under ~/.openswarm/workspaces/ inherit a broken HEAD), we
# need to init a fresh repo AT cwd so it shadows the parent.
_inside = _sp_git.run(
inside = sp_git.run(
["git", "rev-parse", "--is-inside-work-tree"],
cwd=cwd,
stdout=_sp_git.PIPE, stderr=_sp_git.DEVNULL, timeout=5,
stdout=sp_git.PIPE, stderr=sp_git.DEVNULL, timeout=5,
)
if _inside.returncode == 0 and b"true" in _inside.stdout:
if inside.returncode == 0 and b"true" in inside.stdout:
# Check HEAD resolves (has at least one commit).
_head = _sp_git.run(
head = sp_git.run(
["git", "rev-parse", "--verify", "HEAD"],
cwd=cwd,
stdout=_sp_git.DEVNULL, stderr=_sp_git.DEVNULL, timeout=5,
stdout=sp_git.DEVNULL, stderr=sp_git.DEVNULL, timeout=5,
)
if _head.returncode == 0:
if head.returncode == 0:
return # parent repo is healthy, leave it alone
# Parent repo exists but HEAD is broken.
if os.path.isdir(os.path.join(cwd, ".git")):
# .git is directly here, commit to fix it.
_sp_git.run(
sp_git.run(
["git", "-c", "user.email=openswarm@local",
"-c", "user.name=OpenSwarm",
"commit", "--allow-empty", "-q", "-m", "openswarm init"],
cwd=cwd,
stdout=_sp_git.DEVNULL, stderr=_sp_git.DEVNULL, timeout=10,
stdout=sp_git.DEVNULL, stderr=sp_git.DEVNULL, timeout=10,
)
return
# .git is in a parent dir (broken home-dir repo, etc.).
@@ -68,23 +72,24 @@ def _ensure_cwd_git_repo(cwd: str, home: str | None = None) -> None:
# Case B: cwd is not a git repo at all (or parent is broken):
# init + empty commit here.
_sp_git.run(
sp_git.run(
["git", "init", "-q", "-b", "main"],
cwd=cwd,
stdout=_sp_git.DEVNULL, stderr=_sp_git.DEVNULL, timeout=10,
stdout=sp_git.DEVNULL, stderr=sp_git.DEVNULL, timeout=10,
)
_sp_git.run(
sp_git.run(
["git", "-c", "user.email=openswarm@local",
"-c", "user.name=OpenSwarm",
"commit", "--allow-empty", "-q", "-m", "openswarm init"],
cwd=cwd,
stdout=_sp_git.DEVNULL, stderr=_sp_git.DEVNULL, timeout=10,
stdout=sp_git.DEVNULL, stderr=sp_git.DEVNULL, timeout=10,
)
except Exception as _e:
logger.info(f"[agent-cwd] git init skipped: {_e}")
except Exception as exc:
logger.info(f"[agent-cwd] git init skipped: {exc}")
def _detect_git_identity(cwd: str) -> tuple[str | None, str | None]:
@typechecked
def detect_git_identity(cwd: str) -> Tuple[Optional[str], Optional[str]]:
"""Resolve the origin remote and current branch for `cwd`.
Used to label sessions in the session list ("Agent on owner/repo
@@ -97,12 +102,12 @@ def _detect_git_identity(cwd: str) -> tuple[str | None, str | None]:
if not cwd or not os.path.isdir(cwd):
return (None, None)
try:
import subprocess as _sp
url_proc = _sp.run(
import subprocess as sp
url_proc = sp.run(
["git", "remote", "get-url", "origin"],
cwd=cwd, stdout=_sp.PIPE, stderr=_sp.DEVNULL, timeout=3,
cwd=cwd, stdout=sp.PIPE, stderr=sp.DEVNULL, timeout=3,
)
repo_url: str | None = None
repo_url: Optional[str] = None
if url_proc.returncode == 0:
raw = url_proc.stdout.decode("utf-8", errors="replace").strip()
if raw:
@@ -113,11 +118,11 @@ def _detect_git_identity(cwd: str) -> tuple[str | None, str | None]:
repo_url = f"{scheme}://{rest}"
else:
repo_url = raw
branch_proc = _sp.run(
branch_proc = sp.run(
["git", "branch", "--show-current"],
cwd=cwd, stdout=_sp.PIPE, stderr=_sp.DEVNULL, timeout=3,
cwd=cwd, stdout=sp.PIPE, stderr=sp.DEVNULL, timeout=3,
)
branch_name: str | None = None
branch_name: Optional[str] = None
if branch_proc.returncode == 0:
raw_b = branch_proc.stdout.decode("utf-8", errors="replace").strip()
if raw_b: