Merge pull request #311 from tcdent/disable-git-if-repo-exists

Disable git if repo exists

Author: bboynton97

agentstack/cli/init.py

@@ -139,12 +139,21 @@ def init_project(
     packaging.create_venv()
     log.info("Installing dependencies...")
     packaging.install_project()
-    repo.init()  # initialize git repo
+    
+    if repo.find_parent_repo(conf.PATH):
+        # if a repo already exists, we don't want to initialize a new one
+        log.info("Found existing git repository; disabling tracking.")
+        with conf.ConfigFile() as config:
+            config.use_git = False
+    else:
+        # create a new git repo in the project dir
+        repo.init()
 
     # now we can interact with the project and add Agents, Tasks, and Tools
     # we allow dependencies to be installed along with these, so the project must
     # be fully initialized first.
     with repo.Transaction() as commit:
+        commit.add_message("Initialized new project")
         for task in template_data.tasks:
             commit.add_message(f"Added task {task.name}")
             generation.add_task(**task.model_dump())

agentstack/repo.py

@@ -1,3 +1,5 @@
+from typing import Optional
+from pathlib import Path
 import shutil
 import git
 from agentstack import conf, log
@@ -108,6 +110,18 @@ def _require_git():
         raise EnvironmentError(message)
 
 
+def find_parent_repo(path: Path) -> Optional[Path]:
+    """
+    Traverse the directory tree upwards from `path` until a .git directory is found.
+    """
+    current = path.absolute()
+    while current != current.parent:
+        if (current / '.git').exists():
+            return current
+        current = current.parent
+    return None
+
+
 def _get_repo() -> git.Repo:
     """
     Get the git repository for the current project.
@@ -118,22 +132,31 @@ def _get_repo() -> git.Repo:
     """
     _require_git()
     try:
+        # look for a repository in the project's directory
         return git.Repo(conf.PATH.absolute())
     except git.exc.InvalidGitRepositoryError:
         message = "No git repository found in the current project."
         log.warning(message)  # log now since this won't bubble to the user
         raise EnvironmentError(message)
 
 
-def init() -> None:
+def init(force_creation: bool = False) -> None:
     """
     Create a git repository for the current project and commit a .gitignore file
-    to initialize the repo. Assumes that a repo does not already exist.
+    to initialize the repo. 
+    
+    `force_creation` will create a new repo even if one already exists in a parent
+    directory. default: False
     """
     try:
         _require_git()
     except EnvironmentError as e:
         return  # git is not installed or tracking is disabled
+    
+    if find_parent_repo(conf.PATH.absolute()):
+        log.warning("A git repository already exists in a parent directory.")
+        if not force_creation:
+            return
 
     # creates a new repo at conf.PATH / '.git
     repo = git.Repo.init(path=conf.PATH.absolute(), initial_branch=MAIN_BRANCH_NAME)

tests/test_repo.py

@@ -28,7 +28,7 @@ def tearDown(self):
         shutil.rmtree(self.test_dir)
 
     def test_init(self):
-        repo.init()
+        repo.init(force_creation=True)
 
         # Check if a git repository was created
         self.assertTrue((self.test_dir / '.git').is_dir())
@@ -40,19 +40,25 @@ def test_init(self):
         self.assertEqual(len(commits), 1)
         self.assertEqual(commits[0].message, f"{repo.INITIAL_COMMIT_MESSAGE}{repo.AUTOMATION_NOTE}")
 
+    def test_init_parent_repo_exists(self):
+        os.makedirs(self.test_dir.parent / '.git')
+        
+        repo.init(force_creation=False)
+        self.assertFalse((self.test_dir / '.git').is_dir())
+
     def test_get_repo_nonexistent(self):
         with self.assertRaises(EnvironmentError):
             repo._get_repo()
 
     def test_get_repo_existent(self):
-        repo.init()
+        repo.init(force_creation=True)
 
         result = repo._get_repo()
         self.assertIsInstance(result, git.Repo)
         self.assertEqual(result.working_tree_dir, str(self.test_dir))
 
     def test_get_uncommitted_files_new_file(self):
-        repo.init()
+        repo.init(force_creation=True)
 
         new_file = self.test_dir / "new_file.txt"
         new_file.touch()
@@ -62,7 +68,7 @@ def test_get_uncommitted_files_new_file(self):
         self.assertIn("new_file.txt", uncommitted)
 
     def test_get_uncommitted_files_modified_file(self):
-        repo.init()
+        repo.init(force_creation=True)
 
         # Create and commit an initial file
         initial_file = self.test_dir / "initial_file.txt"
@@ -154,7 +160,7 @@ def test_require_git_installed(self, mock_which, mock_should_track):
         repo._require_git()
 
     def test_transaction_context_manager(self):
-        repo.init()
+        repo.init(force_creation=True)
         mock_commit = MagicMock()
 
         with patch('agentstack.repo.commit', mock_commit):
@@ -165,7 +171,7 @@ def test_transaction_context_manager(self):
             mock_commit.assert_called_once_with(f"Test message", ["test_file.txt"], automated=True)
 
     def test_transaction_multiple_messages(self):
-        repo.init()
+        repo.init(force_creation=True)
         mock_commit = MagicMock()
 
         with patch('agentstack.repo.commit', mock_commit):
@@ -180,7 +186,7 @@ def test_transaction_multiple_messages(self):
             )
 
     def test_transaction_no_changes(self):
-        repo.init()
+        repo.init(force_creation=True)
         mock_commit = MagicMock()
 
         with patch('agentstack.repo.commit', mock_commit):
@@ -192,7 +198,7 @@ def test_transaction_no_changes(self):
             mock_commit.assert_not_called()
 
     def test_transaction_with_exception(self):
-        repo.init()
+        repo.init(force_creation=True)
         mock_commit = MagicMock()
 
         with patch('agentstack.repo.commit', mock_commit):
@@ -212,7 +218,7 @@ def test_transaction_with_exception(self):
 
     def test_init_when_git_disabled(self):
         repo.dont_track_changes()
-        result = repo.init()
+        result = repo.init(force_creation=True)
         self.assertIsNone(result)
         repo._USE_GIT = None  # Reset for other tests
 
@@ -235,7 +241,7 @@ def test_get_uncommitted_files_when_git_disabled(self):
         repo._USE_GIT = None  # Reset for other tests
 
     def test_commit_user_changes(self):
-        repo.init()
+        repo.init(force_creation=True)
 
         # Create a new file
         test_file = self.test_dir / "user_file.txt"